diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
index 1ba4e6626..561357304 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
@@ -102,6 +102,11 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
   }
 
   public async getWorkspaceMemberCount(): Promise<number | undefined> {
+    // TODO: to refactor, this could happen today for the first signup since the workspace does not exist yet
+    if (!this.workspaceMemberRepository) {
+      return undefined;
+    }
+
     const workspaceMemberCount = await this.workspaceMemberRepository.count();
 
     return workspaceMemberCount;