diff --git a/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx b/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx
index dfb71eb3dc7..98cebbed741 100644
--- a/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx
+++ b/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx
@@ -12,6 +12,8 @@ import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
+import { FIND_MANY_OBJECT_METADATA_ITEMS } from '@/object-metadata/graphql/queries';
+import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
 import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
 import { AppPath } from '@/types/AppPath';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
@@ -48,12 +50,14 @@ export const CreateWorkspace = () => {
 
   const { enqueueSnackBar } = useSnackBar();
   const onboardingStatus = useOnboardingStatus();
+
   const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
   const setCurrentWorkspaceMember = useSetRecoilState(
     currentWorkspaceMemberState,
   );
 
   const [createWorkspace] = useCreateWorkspaceMutation();
+  const apolloMetadataClient = useApolloMetadataClient();
 
   // Form
   const {
@@ -102,6 +106,9 @@ export const CreateWorkspace = () => {
           },
           avatarUrl: result.data?.createWorkspace?.workspaceMember?.avatarUrl,
         });
+        await apolloMetadataClient?.refetchQueries({
+          include: [FIND_MANY_OBJECT_METADATA_ITEMS],
+        });
 
         if (result.errors || !result.data?.createWorkspace) {
           throw result.errors ?? new Error('Unknown error');
@@ -119,6 +126,7 @@ export const CreateWorkspace = () => {
     [
       enqueueSnackBar,
       navigate,
+      apolloMetadataClient,
       setCurrentWorkspace,
       setCurrentWorkspaceMember,
       createWorkspace,
diff --git a/packages/twenty-server/src/core/workspace/workspace.resolver.ts b/packages/twenty-server/src/core/workspace/workspace.resolver.ts
index 00e415b29bc..077cac4e5d7 100644
--- a/packages/twenty-server/src/core/workspace/workspace.resolver.ts
+++ b/packages/twenty-server/src/core/workspace/workspace.resolver.ts
@@ -12,9 +12,9 @@ import { assert } from 'src/utils/assert';
 import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
 import { UpdateWorkspaceInput } from 'src/core/workspace/dtos/update-workspace-input';
 import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { AuthUser } from 'src/decorators/auth-user.decorator';
 import { User } from 'src/core/user/user.entity';
 import { CreateWorkspaceInput } from 'src/core/workspace/dtos/create-workspace-input';
+import { AuthUser } from 'src/decorators/auth/auth-user.decorator';
 
 import { Workspace } from './workspace.entity';