diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker.ts
index 12b32ace13..572ee39033 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker.ts
@@ -29,7 +29,8 @@ export const manifest: ManifestPropertyEditorSchema = {
 				{
 					alias: 'startNodeId',
 					label: 'Start node',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.MediaPicker',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.MediaEntityPicker',
+					config: [{ alias: 'validationLimit', value: { min: 0, max: 1 } }],
 				},
 				{
 					alias: 'enableLocalFocalPoint',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.RichText.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.RichText.ts
index d74d2e1a9e..3da9f66b76 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.RichText.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.RichText.ts
@@ -12,7 +12,7 @@ export const manifest: ManifestPropertyEditorSchema = {
 					alias: 'mediaParentId',
 					label: 'Image Upload Folder',
 					description: 'Choose the upload location of pasted images',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.MediaPicker',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.MediaEntityPicker',
 					config: [{ alias: 'validationLimit', value: { min: 0, max: 1 } }],
 				},
 				{