diff --git a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx
index 1423b5510a8..d4189bbe5f5 100644
--- a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx
@@ -94,9 +94,11 @@ export function OnboardingForm({
         redirectPath: searchParams.get("next"),
         currentUrl: window.location.href,
       });
-      router.push(
-        `/onboarding/platforms${next ? `?next=${encodeURIComponent(next)}` : ""}`,
-      );
+      if (next) {
+        router.push(next);
+      } else {
+        router.push("/onboarding/platforms");
+      }
     },
     onError: ({ error, input }) => {
       toast.error(parseActionError(error, "An unknown error occurred."));
diff --git a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/payout-provider.tsx b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/payout-provider.tsx
index d8798f8cc3b..fa458669c45 100644
--- a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/payout-provider.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/payout-provider.tsx
@@ -62,7 +62,7 @@ export function PayoutProvider({
         <ConnectPayoutButton text="Connect payouts" />
 
         <Link
-          href={next ?? "/programs"}
+          href="/programs"
           className="text-sm font-medium text-neutral-500 transition-colors hover:text-neutral-800"
         >
           I'll complete this later
diff --git a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page-client.tsx
index b04d68338bd..7a4e94d1fe1 100644
--- a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page-client.tsx
@@ -21,16 +21,12 @@ export function OnboardingPlatformsPageClient({
   return (
     <>
       <PartnerPlatformsForm
-        onSubmitSuccessful={() =>
-          router.push(
-            `/onboarding/payouts${next ? `?next=${encodeURIComponent(next)}` : ""}`,
-          )
-        }
+        onSubmitSuccessful={() => router.push("/onboarding/payouts")}
         partner={partner}
         variant="onboarding"
       />
       <Link
-        href={`/onboarding/payouts${next ? `?next=${encodeURIComponent(next)}` : ""}`}
+        href="/onboarding/payouts"
         className="text-sm font-medium text-neutral-500 transition-colors hover:text-neutral-800"
       >
         I'll complete this later