diff --git a/apps/web/app/auth/sign-in/page.tsx b/apps/web/app/auth/sign-in/page.tsx
index 16ad40c52..93a97cf05 100644
--- a/apps/web/app/auth/sign-in/page.tsx
+++ b/apps/web/app/auth/sign-in/page.tsx
@@ -26,7 +26,7 @@ export const generateMetadata = async () => {
 };
 
 async function SignInPage({ searchParams }: SignInPageProps) {
-  const { invite_token: inviteToken, next = '' } = await searchParams;
+  const { invite_token: inviteToken, next } = await searchParams;
 
   const signUpPath =
     pathsConfig.auth.signUp +
@@ -34,7 +34,7 @@ async function SignInPage({ searchParams }: SignInPageProps) {
 
   const paths = {
     callback: pathsConfig.auth.callback,
-    returnPath: next ?? pathsConfig.app.home,
+    returnPath: next || pathsConfig.app.home,
     joinTeam: pathsConfig.app.joinTeam,
   };
 
diff --git a/packages/features/auth/src/components/sign-in-methods-container.tsx b/packages/features/auth/src/components/sign-in-methods-container.tsx
index c2c558e27..083f379f2 100644
--- a/packages/features/auth/src/components/sign-in-methods-container.tsx
+++ b/packages/features/auth/src/components/sign-in-methods-container.tsx
@@ -45,8 +45,10 @@ export function SignInMethodsContainer(props: {
 
       router.replace(joinTeamPath);
     } else {
+      const returnPath = props.paths.returnPath || '/home';
+
       // otherwise, we should redirect to the return path
-      router.replace(props.paths.returnPath);
+      router.replace(returnPath);
     }
   };