diff --git a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
index 35844c58d..c8357ccc7 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
@@ -13,7 +13,7 @@ export const ObjectMetadataItemsLoadEffect = () => {
   const currentUser = useRecoilValue(currentUserState);
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
 
-  const { objectMetadataItems: newObjectMetadataItems } =
+  const { objectMetadataItems: newObjectMetadataItems, loading } =
     useFindManyObjectMetadataItems({
       skip: isUndefinedOrNull(currentUser),
     });
@@ -28,12 +28,16 @@ export const ObjectMetadataItemsLoadEffect = () => {
       currentWorkspace?.activationStatus !== 'active'
         ? getObjectMetadataItemsMock()
         : newObjectMetadataItems;
-    if (!isDeeplyEqual(objectMetadataItems, toSetObjectMetadataItems)) {
+    if (
+      !loading &&
+      !isDeeplyEqual(objectMetadataItems, toSetObjectMetadataItems)
+    ) {
       setObjectMetadataItems(toSetObjectMetadataItems);
     }
   }, [
     currentUser,
     currentWorkspace?.activationStatus,
+    loading,
     newObjectMetadataItems,
     objectMetadataItems,
     setObjectMetadataItems,
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldTypeSelect.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldTypeSelect.stories.tsx
index ff58bec33..a286e1ea4 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldTypeSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldTypeSelect.stories.tsx
@@ -3,6 +3,7 @@ import { expect, userEvent, within } from '@storybook/test';
 import { ComponentDecorator } from 'twenty-ui';
 
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { FormProviderDecorator } from '~/testing/decorators/FormProviderDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
 import { SettingsDataModelFieldTypeSelect } from '../SettingsDataModelFieldTypeSelect';
@@ -11,7 +12,7 @@ const meta: Meta<typeof SettingsDataModelFieldTypeSelect> = {
   title:
     'Modules/Settings/DataModel/Fields/Forms/SettingsDataModelFieldTypeSelect',
   component: SettingsDataModelFieldTypeSelect,
-  decorators: [ComponentDecorator],
+  decorators: [FormProviderDecorator, ComponentDecorator],
   parameters: {
     container: { width: 512 },
     msw: graphqlMocks,
@@ -33,11 +34,11 @@ export const WithOpenSelect: Story = {
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
 
-    const inputField = await canvas.findByText('Text');
+    const inputField = await canvas.findByText('Unique ID');
 
     await userEvent.click(inputField);
 
-    const input = await canvas.findByText('Unique ID');
+    const input = await canvas.findByText('Text');
     await userEvent.click(input);
 
     await userEvent.click(inputField);