diff --git a/packages/admin-ui/src/lib/core/src/common/utilities/custom-field-default-value.ts b/packages/admin-ui/src/lib/core/src/common/utilities/custom-field-default-value.ts
index 8430bbe310..1711b5b658 100644
--- a/packages/admin-ui/src/lib/core/src/common/utilities/custom-field-default-value.ts
+++ b/packages/admin-ui/src/lib/core/src/common/utilities/custom-field-default-value.ts
@@ -20,9 +20,9 @@ export function getDefaultValue(type: CustomFieldType, isNullable?: boolean) {
         case 'string':
         case 'text':
         case 'localeText':
-            return '';
+            return isNullable ? null : '';
         case 'boolean':
-            return false;
+            return isNullable ? null : false;
         case 'float':
         case 'int':
             return isNullable ? null : 0;