diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect.tsx
index 1b22299c54..f553de2cc5 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect.tsx
@@ -1,35 +1,56 @@
 import { useAuth } from '@/auth/hooks/useAuth';
+import { useHasAccessTokenPair } from '@/auth/hooks/useHasAccessTokenPair';
 import {
   SignInUpStep,
   signInUpStepState,
 } from '@/auth/states/signInUpStepState';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
 import { useLoadCurrentUser } from '@/users/hooks/useLoadCurrentUser';
 import { useEffect } from 'react';
 import { useSearchParams } from 'react-router-dom';
-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
 import { isDefined } from 'twenty-shared/utils';
 
 export const SignInUpGlobalScopeFormEffect = () => {
   const setSignInUpStep = useSetAtomState(signInUpStepState);
+  const signInUpStep = useAtomStateValue(signInUpStepState);
   const [searchParams, setSearchParams] = useSearchParams();
   const { setAuthTokens } = useAuth();
   const { loadCurrentUser } = useLoadCurrentUser();
+  const hasAccessTokenPair = useHasAccessTokenPair();
 
   useEffect(() => {
-    const tokenPair = searchParams.get('tokenPair');
-    if (isDefined(tokenPair)) {
-      setAuthTokens(JSON.parse(tokenPair));
+    // Path 1: user just bounced back from social SSO with a workspace-agnostic
+    // tokenPair in the URL. Honor it unconditionally.
+    const tokenPairFromUrl = searchParams.get('tokenPair');
+    if (isDefined(tokenPairFromUrl)) {
+      setAuthTokens(JSON.parse(tokenPairFromUrl));
       searchParams.delete('tokenPair');
       setSearchParams(searchParams);
       loadCurrentUser();
       setSignInUpStep(SignInUpStep.WorkspaceSelection);
+      return;
     }
+
+    // Path 2: user revisits /welcome with a still-valid workspace-agnostic
+    // tokenPair cookie left over from a prior SSO landing. Resume straight
+    // to workspace selection instead of forcing them through the sign-in
+    // form again. The step transition gates re-entry; if the cookie is
+    // stale, loadCurrentUser triggers Apollo's renewal -> onUnauthenticatedError
+    // path which clears the cookie and falls back to the normal form.
+    if (signInUpStep !== SignInUpStep.Init) return;
+    if (!hasAccessTokenPair) return;
+
+    loadCurrentUser();
+    setSignInUpStep(SignInUpStep.WorkspaceSelection);
   }, [
     searchParams,
     setSearchParams,
     setSignInUpStep,
     loadCurrentUser,
     setAuthTokens,
+    signInUpStep,
+    hasAccessTokenPair,
   ]);
 
   return <></>;