diff --git a/packages/supabase/src/auth-callback.service.ts b/packages/supabase/src/auth-callback.service.ts
index dec133f88..1cefaf2e0 100644
--- a/packages/supabase/src/auth-callback.service.ts
+++ b/packages/supabase/src/auth-callback.service.ts
@@ -49,21 +49,19 @@ class AuthCallbackService {
     const token_hash = searchParams.get('token_hash');
     const type = searchParams.get('type') as EmailOtpType | null;
     const callbackParam = searchParams.get('callback');
-    const nextParam = searchParams.get('next');
 
     let nextPath: string | null = null;
     const callbackUrl = callbackParam ? new URL(callbackParam) : null;
 
-    // if we have a next path in the query params, we use that
-    if (nextParam) {
-      nextPath = nextParam;
-    } else {
+    if (callbackUrl) {
       // if we have a callback url, we check if it has a next path
-      const callbackNextPath = callbackUrl ? callbackUrl.searchParams.get('next') : null;
+      const callbackNextPath = callbackUrl.searchParams.get('next');
 
       // if we have a next path in the callback url, we use that
       if (callbackNextPath) {
         nextPath = callbackNextPath;
+      } else {
+        nextPath = callbackUrl.pathname;
       }
     }