diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/media-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/media-picker-modal.element.ts
index 2871e3a290..021e2ea06e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/media-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/media-picker-modal.element.ts
@@ -39,16 +39,12 @@ export class UmbMediaPickerModalElement extends UmbModalBaseElement<UmbMediaPick
 	@state()
 	private _selectableNonImages = true;
 
-	@state()
-	private _selectableFolders = true;
-
 	@query('#dropzone')
 	private _dropzone!: UmbDropzoneElement;
 
 	connectedCallback(): void {
 		super.connectedCallback();
 		this._selectableNonImages = this.data?.selectableNonImages ?? true;
-		this._selectableFolders = this.data?.selectableFolders ?? true;
 		this._currentPath = this.data?.startNode ?? null;
 		this.#loadMediaFolder();
 	}
@@ -69,13 +65,12 @@ export class UmbMediaPickerModalElement extends UmbModalBaseElement<UmbMediaPick
 
 		const { data } = await this.#mediaUrlRepository.requestItems(items.map((item) => item.unique));
 
-		return items.map((item) => {
+		return items.map((item): UmbMediaCardItemModel => {
 			const url = data?.find((media) => media.unique === item.unique)?.url;
 			const extension = url?.split('.').pop();
-			const isFolder = isUmbracoFolder(item.mediaType?.unique);
-			const isImageRenderable = url ? !!mime.getType(url)?.startsWith('image/') : false;
+			const isImage = url ? !!mime.getType(url)?.startsWith('image/') : false;
 
-			return { name: item.name, unique: item.unique, isImageRenderable, url, isFolder, extension };
+			return { name: item.name, unique: item.unique, isImage, url, extension };
 		});
 	}
 
@@ -204,11 +199,9 @@ export class UmbMediaPickerModalElement extends UmbModalBaseElement<UmbMediaPick
 				@selected=${() => this.#onSelected(item)}
 				@deselected=${() => this.#onDeselected(item)}
 				?selected=${this.value?.selection?.find((value) => value === item.unique)}
-				?selectable=${(!item.isFolder || this._selectableFolders) &&
-				(item.isImageRenderable || this._selectableNonImages)}
-				?select-only=${!item.isFolder}
+				?selectable=${item.isImage || this._selectableNonImages}
 				file-ext=${ifDefined(item.extension)}>
-				${item.isImageRenderable && item.url ? html`<img src=${item.url} alt=${ifDefined(item.name)} />` : ''}
+				${item.isImage && item.url ? html`<img src=${item.url} alt=${ifDefined(item.name)} />` : ''}
 			</uui-card-media>
 		`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/media-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/media-picker-modal.token.ts
index 50df522088..ff01a1fc80 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/media-picker-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/media-picker-modal.token.ts
@@ -2,7 +2,6 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbMediaPickerModalData {
 	startNode?: string | null;
-	selectableFolders?: boolean;
 	selectableNonImages?: boolean;
 	multiple?: boolean;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/types.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/types.ts
index 1e9286488c..bcfd0358e3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/types.ts
@@ -3,8 +3,7 @@ export interface UmbMediaCardItemModel {
 	unique: string;
 	url?: string;
 	extension?: string;
-	isFolder: boolean;
-	isImageRenderable: boolean;
+	isImage: boolean;
 }
 
 export interface UmbMediaPathModel {