diff --git a/src/Umbraco.Web.UI.Client/libs/modal/modal.interfaces.ts b/src/Umbraco.Web.UI.Client/libs/modal/modal.interfaces.ts
index 6b7530c9bb..110dc4a309 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/modal.interfaces.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/modal.interfaces.ts
@@ -9,5 +9,5 @@ export interface UmbPickerModalResult {
 }
 
 export interface UmbTreePickerModalData<TreeItemType> extends UmbPickerModalData<TreeItemType> {
-	treeAlias: string;
+	treeAlias?: string;
 }
diff --git a/src/Umbraco.Web.UI.Client/libs/modal/token/document-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/libs/modal/token/document-picker-modal.token.ts
index 5209f34110..60f45eafee 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/token/document-picker-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/token/document-picker-modal.token.ts
@@ -1,18 +1,16 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { DocumentTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
+import { UmbModalToken, UmbPickerModalResult, UmbTreePickerModalData } from '@umbraco-cms/backoffice/modal';
 
-export interface UmbDocumentPickerModalData {
-	multiple?: boolean;
-	selection?: Array<string | null>;
-}
-
-export interface UmbDocumentPickerModalResult {
-	selection: Array<string | null>;
-}
+export type UmbDocumentPickerModalData = UmbTreePickerModalData<DocumentTreeItemResponseModel>;
+export type UmbDocumentPickerModalResult = UmbPickerModalResult;
 
 export const UMB_DOCUMENT_PICKER_MODAL = new UmbModalToken<UmbDocumentPickerModalData, UmbDocumentPickerModalResult>(
-	'Umb.Modal.DocumentPicker',
+	'Umb.Modal.TreePicker',
 	{
 		type: 'sidebar',
 		size: 'small',
+	},
+	{
+		treeAlias: 'Umb.Tree.Documents',
 	}
 );
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/manifests.ts
index b06012c704..7e4ce1758a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/manifests.ts
@@ -5,7 +5,6 @@ import { manifests as treeManifests } from './tree/manifests';
 import { manifests as workspaceManifests } from './workspace/manifests';
 import { manifests as entityActionManifests } from './entity-actions/manifests';
 import { manifests as entityBulkActionManifests } from './entity-bulk-actions/manifests';
-import { manifests as modalManifests } from './modals/manifests';
 import { manifests as propertyEditorManifests } from './property-editors/manifests';
 
 export const manifests = [
@@ -16,6 +15,5 @@ export const manifests = [
 	...workspaceManifests,
 	...entityActionManifests,
 	...entityBulkActionManifests,
-	...modalManifests,
 	...propertyEditorManifests,
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/manifests.ts
deleted file mode 100644
index e125e8b4c8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/manifests.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { DOCUMENT_TREE_ALIAS } from '../tree/manifests';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extensions-registry';
-
-const modals: Array<ManifestModal> = [
-	{
-		type: 'modal',
-		kind: 'treePicker',
-		alias: 'Umb.Modal.DocumentPicker',
-		name: 'Document Picker Modal',
-		meta: {
-			treeAlias: DOCUMENT_TREE_ALIAS,
-		},
-	},
-];
-
-export const manifests = [...modals];