diff --git a/apps/meteor/client/components/CustomFieldsForm.js b/apps/meteor/client/components/CustomFieldsForm.js
index b4c5d131716e1..1e23b8ce9ccf4 100644
--- a/apps/meteor/client/components/CustomFieldsForm.js
+++ b/apps/meteor/client/components/CustomFieldsForm.js
@@ -112,13 +112,7 @@ const CustomFieldsAssembler = ({ formValues, formHandlers, customFields, ...prop
 		return null;
 	});
 
-export default function CustomFieldsForm({
-	jsonCustomFields = {},
-	customFieldsData,
-	setCustomFieldsData,
-	onLoadFields = () => {},
-	...props
-}) {
+export default function CustomFieldsForm({ jsonCustomFields, customFieldsData, setCustomFieldsData, onLoadFields = () => {}, ...props }) {
 	const accountsCustomFieldsJson = useSetting('Accounts_CustomFields');
 
 	const [customFields] = useState(() => {
diff --git a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
index a081b9f53e5db..4adfdd65ac78f 100644
--- a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
@@ -360,7 +360,7 @@ const AccountProfileForm = ({ values, handlers, user, settings, onSaveStateChang
 					</Grid.Item>
 				</Grid>
 			</Field>
-			<CustomFieldsForm customFieldsData={customFields} setCustomFieldsData={handleCustomFields} />
+			<CustomFieldsForm jsonCustomFields={undefined} customFieldsData={customFields} setCustomFieldsData={handleCustomFields} />
 		</FieldGroup>
 	);
 };