diff --git a/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts b/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
index 14349aaad05..7f8d8dae6cf 100644
--- a/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
@@ -66,16 +66,6 @@ describe('useOnboardingStatus', () => {
     expect(result.current.onboardingStatus).toBe('ongoing_user_creation');
   });
 
-  it('should return undefined when currentWorkspaceMember in undefined', async () => {
-    const { result } = renderHooks();
-
-    act(() => {
-      result.current.setTokenPair(tokenPair);
-    });
-
-    expect(result.current.onboardingStatus).toBe(undefined);
-  });
-
   it('should return "incomplete"', async () => {
     const { result } = renderHooks();
     const {
@@ -120,6 +110,25 @@ describe('useOnboardingStatus', () => {
     expect(result.current.onboardingStatus).toBe('canceled');
   });
 
+  it('should return "ongoing_workspace_activation"', async () => {
+    const { result } = renderHooks();
+    const { setTokenPair, setBilling, setCurrentWorkspace } = result.current;
+
+    act(() => {
+      setTokenPair(tokenPair);
+      setBilling(billing);
+      setCurrentWorkspace({
+        ...currentWorkspace,
+        displayName: '',
+        subscriptionStatus: 'active',
+      });
+    });
+
+    expect(result.current.onboardingStatus).toBe(
+      'ongoing_workspace_activation',
+    );
+  });
+
   it('should return "ongoing_workspace_creation"', async () => {
     const { result } = renderHooks();
     const {
@@ -135,7 +144,7 @@ describe('useOnboardingStatus', () => {
       setCurrentWorkspace({
         ...currentWorkspace,
         displayName: '',
-        subscriptionStatus: 'completed',
+        subscriptionStatus: 'active',
       });
       setCurrentWorkspaceMember(currentWorkspaceMember);
     });
@@ -157,7 +166,7 @@ describe('useOnboardingStatus', () => {
       setBilling(billing);
       setCurrentWorkspace({
         ...currentWorkspace,
-        subscriptionStatus: 'completed',
+        subscriptionStatus: 'active',
       });
       setCurrentWorkspaceMember(currentWorkspaceMember);
     });
@@ -179,7 +188,7 @@ describe('useOnboardingStatus', () => {
       setBilling(billing);
       setCurrentWorkspace({
         ...currentWorkspace,
-        subscriptionStatus: 'completed',
+        subscriptionStatus: 'active',
       });
       setCurrentWorkspaceMember({
         ...currentWorkspaceMember,
diff --git a/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts b/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts
index b71e5a24893..bf4a81dc158 100644
--- a/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts
+++ b/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts
@@ -11,10 +11,13 @@ describe('getOnboardingStatus', () => {
       currentWorkspace: null,
     });
 
-    const unknownStatus = getOnboardingStatus({
+    const ongoingWorkspaceActivation = getOnboardingStatus({
       isLoggedIn: true,
       currentWorkspaceMember: null,
-      currentWorkspace: null,
+      currentWorkspace: {
+        id: '1',
+        displayName: null,
+      } as CurrentWorkspace,
     });
 
     const ongoingWorkspaceCreation = getOnboardingStatus({
@@ -110,7 +113,7 @@ describe('getOnboardingStatus', () => {
     });
 
     expect(ongoingUserCreation).toBe('ongoing_user_creation');
-    expect(unknownStatus).toBe(undefined);
+    expect(ongoingWorkspaceActivation).toBe('ongoing_workspace_activation');
     expect(ongoingWorkspaceCreation).toBe('ongoing_workspace_creation');
     expect(ongoingProfileCreation).toBe('ongoing_profile_creation');
     expect(completed).toBe('completed');
diff --git a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
index bf8414d84d1..4e8f5902324 100644
--- a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
+++ b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
@@ -40,14 +40,14 @@ export const getOnboardingStatus = ({
     return OnboardingStatus.Canceled;
   }
 
-  if (!currentWorkspace?.displayName) {
-    return OnboardingStatus.OngoingWorkspaceCreation;
-  }
-
   if (!currentWorkspaceMember) {
     return OnboardingStatus.OngoingWorkspaceActivation;
   }
 
+  if (!currentWorkspace?.displayName) {
+    return OnboardingStatus.OngoingWorkspaceCreation;
+  }
+
   if (
     !currentWorkspaceMember.name.firstName ||
     !currentWorkspaceMember.name.lastName