diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
index 428bebecf1..0db5ee51c2 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -577,7 +577,13 @@ export class UserResolver {
     @AuthWorkspace({ allowUndefined: true })
     workspace: WorkspaceEntity | undefined,
   ) {
-    return workspace;
+    if (!isDefined(workspace)) {
+      return null;
+    }
+
+    return this.userService.refreshWorkspaceIfPendingOrOngoingCreation(
+      workspace,
+    );
   }
 
   @ResolveField(() => [UserWorkspaceEntity], {