diff --git a/.changeset/spicy-brooms-hang.md b/.changeset/spicy-brooms-hang.md
new file mode 100644
index 0000000000..23f7da309b
--- /dev/null
+++ b/.changeset/spicy-brooms-hang.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Fixing bug in `formData` type as it should be `optional` as it's possibly undefined
diff --git a/plugins/scaffolder-react/api-report.md b/plugins/scaffolder-react/api-report.md
index 311f4116b3..850c30ced8 100644
--- a/plugins/scaffolder-react/api-report.md
+++ b/plugins/scaffolder-react/api-report.md
@@ -304,7 +304,7 @@ export interface ScaffolderRJSFFieldProps<
   disabled: boolean;
   errorSchema?: ErrorSchema<T>;
   formContext?: F;
-  formData: T;
+  formData?: T;
   hideError?: boolean;
   idPrefix?: string;
   idSchema: IdSchema<T>;
diff --git a/plugins/scaffolder-react/src/extensions/rjsf.ts b/plugins/scaffolder-react/src/extensions/rjsf.ts
index b81f06758f..b90caabdb0 100644
--- a/plugins/scaffolder-react/src/extensions/rjsf.ts
+++ b/plugins/scaffolder-react/src/extensions/rjsf.ts
@@ -64,7 +64,7 @@ export interface ScaffolderRJSFFieldProps<
   /** The tree of unique ids for every child field */
   idSchema: IdSchema<T>;
   /** The data for this field */
-  formData: T;
+  formData?: T;
   /** The tree of errors for this field and its children */
   errorSchema?: ErrorSchema<T>;
   /** The field change event handler; called with the updated form data and an optional `ErrorSchema` */
diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
index f8fc831976..4ea26b4414 100644
--- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
@@ -115,7 +115,7 @@ export const MultiEntityPicker = (props: MultiEntityPickerProps) => {
             }
 
             // We need to check against formData here as that's the previous value for this field.
-            if (formData.includes(ref) || allowArbitraryValues) {
+            if (formData?.includes(ref) || allowArbitraryValues) {
               return entityRef;
             }
           }
@@ -173,7 +173,7 @@ export const MultiEntityPicker = (props: MultiEntityPickerProps) => {
             required={required}
             InputProps={{
               ...params.InputProps,
-              required: formData.length === 0 && required,
+              required: formData?.length === 0 && required,
             }}
           />
         )}