diff --git a/packages/twenty-front/src/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
index 9baa5251d96..989d8377325 100644
--- a/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
+++ b/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
@@ -30,7 +30,6 @@ export const PageChangeEffect = () => {
   const [previousLocation, setPreviousLocation] = useState('');
 
   const onboardingStatus = useOnboardingStatus();
-  console.log('onboardingStatus', onboardingStatus);
 
   const setHotkeyScope = useSetHotkeyScope();
 
diff --git a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
index 2b5cabb3fdf..8fd70236d38 100644
--- a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
+++ b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
@@ -42,9 +42,11 @@ export const getOnboardingStatus = ({
   if (!currentWorkspace?.displayName) {
     return OnboardingStatus.OngoingWorkspaceCreation;
   }
+
   if (!currentWorkspaceMember) {
     return undefined;
   }
+
   if (
     !currentWorkspaceMember.name.firstName ||
     !currentWorkspaceMember.name.lastName
diff --git a/packages/twenty-front/src/utils/logDebug.ts b/packages/twenty-front/src/utils/logDebug.ts
index 7b7df76a3a1..049dad71fc6 100644
--- a/packages/twenty-front/src/utils/logDebug.ts
+++ b/packages/twenty-front/src/utils/logDebug.ts
@@ -1,4 +1,4 @@
 /* eslint-disable no-console */
 export const logDebug = (message: any, ...optionalParams: any[]) => {
-  console.log(message, optionalParams);
+  console.debug(message, optionalParams);
 };
diff --git a/packages/twenty-server/src/core/auth/strategies/jwt.auth.strategy.ts b/packages/twenty-server/src/core/auth/strategies/jwt.auth.strategy.ts
index 437f0ac8e00..32e4db5fc41 100644
--- a/packages/twenty-server/src/core/auth/strategies/jwt.auth.strategy.ts
+++ b/packages/twenty-server/src/core/auth/strategies/jwt.auth.strategy.ts
@@ -45,7 +45,6 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
     if (!workspace) {
       throw new UnauthorizedException();
     }
-
     if (payload.jti) {
       const dataSourceMetadata =
         await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
diff --git a/packages/twenty-server/src/core/user/services/user.service.ts b/packages/twenty-server/src/core/user/services/user.service.ts
index e9692772ddf..40aa87ba05b 100644
--- a/packages/twenty-server/src/core/user/services/user.service.ts
+++ b/packages/twenty-server/src/core/user/services/user.service.ts
@@ -21,17 +21,23 @@ export class UserService extends TypeOrmQueryService<User> {
   }
 
   async loadWorkspaceMember(user: User) {
-    let dataSourceMetadata;
+    const dataSourcesMetadata =
+      await this.dataSourceService.getDataSourcesMetadataFromWorkspaceId(
+        user.defaultWorkspace.id,
+      );
 
-    try {
-      dataSourceMetadata =
-        await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
-          user.defaultWorkspace.id,
-        );
-    } catch (e) {
+    if (!dataSourcesMetadata.length) {
       return;
     }
 
+    if (dataSourcesMetadata.length > 1) {
+      throw new Error(
+        `user '${user.id}' default workspace '${user.defaultWorkspace.id}' has multiple data source metadata`,
+      );
+    }
+
+    const dataSourceMetadata = dataSourcesMetadata[0];
+
     const workspaceDataSource =
       await this.typeORMService.connectToDataSource(dataSourceMetadata);