diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts
index e0cd4d9376..576a71ca84 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts
@@ -2,11 +2,10 @@ import { useFormContext } from 'react-hook-form';
 
 import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';
 import { type SettingsDataModelFieldCurrencyFormValues } from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm';
-import { isNonEmptyString } from '@sniptt/guards';
 import { CurrencyCode } from 'twenty-shared/constants';
+import { getFieldMetadataItemInitialValues } from '~/pages/settings/data-model/utils/getFieldMetadataItemInitialValues';
 import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';
 import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
-import { stripSimpleQuotesFromString } from '~/utils/string/stripSimpleQuotesFromString';
 
 type UseCurrencySettingsFormInitialValuesArgs = {
   existingFieldMetadataId: string;
@@ -18,25 +17,23 @@ export const useCurrencySettingsFormInitialValues = ({
     existingFieldMetadataId,
   );
 
-  const initialAmountMicrosValue =
-    (fieldMetadataItem?.defaultValue?.amountMicros as number | null) ?? null;
-  const initialCurrencyCodeValue = isNonEmptyString(
-    stripSimpleQuotesFromString(fieldMetadataItem?.defaultValue?.currencyCode),
-  )
-    ? fieldMetadataItem?.defaultValue?.currencyCode
-    : applySimpleQuotesToString(CurrencyCode.USD);
+  const { settings, defaultValue } =
+    getFieldMetadataItemInitialValues(fieldMetadataItem);
 
   const initialFormValues: SettingsDataModelFieldCurrencyFormValues = {
-    settings: {
-      format: fieldMetadataItem?.settings?.format ?? 'short',
-      decimals: fieldMetadataItem?.settings?.decimals ?? DEFAULT_DECIMAL_VALUE,
+    settings: settings ?? {
+      format: 'short',
+      decimals: DEFAULT_DECIMAL_VALUE,
     },
-    defaultValue: {
-      amountMicros: initialAmountMicrosValue,
-      currencyCode: initialCurrencyCodeValue,
+    defaultValue: defaultValue ?? {
+      amountMicros: null,
+      currencyCode: applySimpleQuotesToString(CurrencyCode.USD),
     },
   };
 
+  const initialAmountMicrosValue = initialFormValues.defaultValue.amountMicros;
+  const initialCurrencyCodeValue = initialFormValues.defaultValue.currencyCode;
+
   const { resetField } =
     useFormContext<SettingsDataModelFieldCurrencyFormValues>();
 
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
index 3c5f199e6a..a3a2af21d0 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -43,6 +43,7 @@ import { Section } from 'twenty-ui/layout';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { useNavigateApp } from '~/hooks/useNavigateApp';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { getFieldMetadataItemInitialValues } from '~/pages/settings/data-model/utils/getFieldMetadataItemInitialValues';
 
 //TODO: fix this type
 export type SettingsDataModelFieldEditFormValues = z.infer<
@@ -107,6 +108,9 @@ export const SettingsObjectFieldEdit = () => {
   const getRelationMetadata = useGetRelationMetadata();
   const { updateOneFieldMetadataItem } = useUpdateOneFieldMetadataItem();
 
+  const { settings, defaultValue } =
+    getFieldMetadataItemInitialValues(fieldMetadataItem);
+
   const formConfig = useForm<SettingsDataModelFieldEditFormValues>({
     mode: 'onTouched',
     resolver: zodResolver(settingsFieldFormSchema()),
@@ -116,7 +120,8 @@ export const SettingsObjectFieldEdit = () => {
       label: fieldMetadataItem?.label ?? '',
       description: fieldMetadataItem?.description,
       isLabelSyncedWithName: fieldMetadataItem?.isLabelSyncedWithName ?? true,
-      settings: fieldMetadataItem?.settings,
+      settings,
+      defaultValue,
     },
   });
 
diff --git a/packages/twenty-front/src/pages/settings/data-model/utils/getFieldMetadataItemInitialValues.ts b/packages/twenty-front/src/pages/settings/data-model/utils/getFieldMetadataItemInitialValues.ts
new file mode 100644
index 0000000000..7747a19f73
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/data-model/utils/getFieldMetadataItemInitialValues.ts
@@ -0,0 +1,35 @@
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { isNonEmptyString } from '@sniptt/guards';
+import { CurrencyCode } from 'twenty-shared/constants';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';
+import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
+
+export const getFieldMetadataItemInitialValues = (
+  fieldMetadataItem: FieldMetadataItem | undefined,
+) => {
+  if (fieldMetadataItem?.type !== FieldMetadataType.CURRENCY) {
+    return {
+      settings: fieldMetadataItem?.settings ?? undefined,
+      defaultValue: fieldMetadataItem?.defaultValue ?? undefined,
+    };
+  }
+
+  const settings = fieldMetadataItem.settings ?? {
+    format: 'short',
+    decimals: DEFAULT_DECIMAL_VALUE,
+  };
+
+  const currencyCode = isNonEmptyString(
+    fieldMetadataItem.defaultValue?.currencyCode,
+  )
+    ? fieldMetadataItem.defaultValue?.currencyCode
+    : applySimpleQuotesToString(CurrencyCode.USD);
+
+  const defaultValue = {
+    amountMicros: fieldMetadataItem.defaultValue?.amountMicros ?? null,
+    currencyCode,
+  };
+
+  return { settings, defaultValue };
+};