diff --git a/packages/twenty-front/src/modules/users/components/UserProvider.tsx b/packages/twenty-front/src/modules/users/components/UserProvider.tsx
index 806bcf35e..e35cbabfa 100644
--- a/packages/twenty-front/src/modules/users/components/UserProvider.tsx
+++ b/packages/twenty-front/src/modules/users/components/UserProvider.tsx
@@ -2,10 +2,18 @@ import React from 'react';
 import { useRecoilValue } from 'recoil';
 
 import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadingState';
+import { AppPath } from '@/types/AppPath';
+import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 import { UserOrMetadataLoader } from '~/loading/components/UserOrMetadataLoader';
 
 export const UserProvider = ({ children }: React.PropsWithChildren) => {
   const isCurrentUserLoaded = useRecoilValue(isCurrentUserLoadedState);
+  const isMatchingLocation = useIsMatchingLocation();
 
-  return !isCurrentUserLoaded ? <UserOrMetadataLoader /> : <>{children}</>;
+  return !isCurrentUserLoaded &&
+    !isMatchingLocation(AppPath.CreateWorkspace) ? (
+    <UserOrMetadataLoader />
+  ) : (
+    <>{children}</>
+  );
 };