diff --git a/apps/web/app/update-password/page.tsx b/apps/web/app/update-password/page.tsx
index a06007608..f78bbd752 100644
--- a/apps/web/app/update-password/page.tsx
+++ b/apps/web/app/update-password/page.tsx
@@ -17,12 +17,21 @@ export const generateMetadata = async () => {
 
 const Logo = () => <AppLogo href={''} />;
 
-async function UpdatePasswordPage() {
+interface UpdatePasswordPageProps {
+  searchParams: Promise<{
+    callback?: string;
+  }>;
+}
+
+async function UpdatePasswordPage(props: UpdatePasswordPageProps) {
   await requireUserInServerComponent();
 
+  const { callback } = await props.searchParams;
+  const redirectTo = callback ?? pathsConfig.app.home;
+
   return (
     <AuthLayoutShell Logo={Logo}>
-      <UpdatePasswordForm redirectTo={pathsConfig.app.home} />
+      <UpdatePasswordForm redirectTo={redirectTo} />
     </AuthLayoutShell>
   );
 }
diff --git a/packages/supabase/src/auth-callback.service.ts b/packages/supabase/src/auth-callback.service.ts
index 6a68d4575..d2c35ff5c 100644
--- a/packages/supabase/src/auth-callback.service.ts
+++ b/packages/supabase/src/auth-callback.service.ts
@@ -74,7 +74,6 @@ class AuthCallbackService {
     searchParams.delete('token_hash');
     searchParams.delete('type');
     searchParams.delete('next');
-    searchParams.delete('callback');
 
     // if we have a next path, we redirect to that path
     if (nextPath) {