diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx
index 973afc2ad1..edd777652b 100644
--- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx
@@ -743,10 +743,7 @@ describe('<MultiEntityPicker />', () => {
     });
 
     it('limit the number of selected entities when maxNoOfEntities is specified', async () => {
-      const uiOptions = props.uiSchema['ui:options'];
-      if (uiOptions) {
-        uiOptions.maxNoOfEntities = 2;
-      }
+      props.schema.maxItems = 2;
       await renderInTestApp(
         <Wrapper>
           <MultiEntityPicker {...props} />
@@ -782,7 +779,8 @@ describe('<MultiEntityPicker />', () => {
       ]);
     });
 
-    it('does not limit the number of selected entities when maxNoOfEntities is not specified', async () => {
+    it('does not limit the number of selected entities when maxItems is not specified', async () => {
+      props.schema.maxItems = undefined;
       await renderInTestApp(
         <Wrapper>
           <MultiEntityPicker {...props} />
diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
index f620c75d07..f514bfc2bb 100644
--- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
@@ -93,8 +93,8 @@ export const MultiEntityPicker = (props: MultiEntityPickerProps) => {
   const allowArbitraryValues =
     uiSchema['ui:options']?.allowArbitraryValues ?? true;
 
-  // if not specified, default to undefined
-  const maxNoOfEntities = uiSchema['ui:options']?.maxNoOfEntities ?? undefined;
+  // if not specified, maxItems defaults to undefined
+  const maxItems = props.schema.maxItems;
 
   const onSelect = useCallback(
     (_: any, refs: (string | Entity)[], reason: AutocompleteChangeReason) => {
@@ -164,7 +164,7 @@ export const MultiEntityPicker = (props: MultiEntityPickerProps) => {
                 ?.entityRef!
         }
         getOptionDisabled={_options =>
-          maxNoOfEntities ? noOfItemsSelected >= maxNoOfEntities : false
+          maxItems ? noOfItemsSelected >= maxItems : false
         }
         autoSelect
         freeSolo={allowArbitraryValues}
diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts b/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts
index 0c7989e8bf..2621157d02 100644
--- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts
+++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts
@@ -47,10 +47,6 @@ export const MultiEntityPickerFieldSchema = makeFieldSchemaFromZod(
       .or(entityQueryFilterExpressionSchema)
       .optional()
       .describe('List of key-value filter expression for entities'),
-    maxNoOfEntities: z
-      .number()
-      .optional()
-      .describe('The maximum number of entities that can be selected'),
   }),
 );