diff --git a/plugins/scaffolder/src/legacy/TemplateEditorPage/CustomFieldExplorer.tsx b/plugins/scaffolder/src/legacy/TemplateEditorPage/CustomFieldExplorer.tsx
index de0c243e42..0ba5db560a 100644
--- a/plugins/scaffolder/src/legacy/TemplateEditorPage/CustomFieldExplorer.tsx
+++ b/plugins/scaffolder/src/legacy/TemplateEditorPage/CustomFieldExplorer.tsx
@@ -150,8 +150,7 @@ export const CustomFieldExplorer = ({
           <CardContent>
             <Form
               showErrorList={false}
-              // @ts-ignore
-              fields={{ ...fieldOverrides, ...fieldComponents }}
+              fields={{ ...fieldComponents }}
               noHtml5Validate
               formData={fieldFormState}
               formContext={{ fieldFormState }}
diff --git a/plugins/scaffolder/src/next/TemplateEditorPage/CustomFieldExplorer.tsx b/plugins/scaffolder/src/next/TemplateEditorPage/CustomFieldExplorer.tsx
index af195b866a..a6c06ea20a 100644
--- a/plugins/scaffolder/src/next/TemplateEditorPage/CustomFieldExplorer.tsx
+++ b/plugins/scaffolder/src/next/TemplateEditorPage/CustomFieldExplorer.tsx
@@ -150,7 +150,6 @@ export const CustomFieldExplorer = ({
           <CardContent>
             <Form
               showErrorList={false}
-              // @ts-ignore
               fields={{ ...fieldComponents }}
               noHtml5Validate
               formData={fieldFormState}