diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
index af12da975..db03c32b1 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
@@ -562,12 +562,14 @@ export class AuthService {
       );
     }
 
-    return await this.workspaceRepository.findOne({
-      where: {
-        id: params.workspaceId,
-      },
-      relations: ['approvedAccessDomains'],
-    });
+    return params.workspaceId
+      ? await this.workspaceRepository.findOne({
+          where: {
+            id: params.workspaceId,
+          },
+          relations: ['approvedAccessDomains'],
+        })
+      : undefined;
   }
 
   formatUserDataPayload(