diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts
index b0bee29cb5..0846cc4cf8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts
@@ -25,7 +25,6 @@ export * from './input-multi-url/index.js';
 export * from './input-number-range/index.js';
 export * from './input-radio-button-list/index.js';
 export * from './input-slider/index.js';
-export * from './input-tree-picker-source/index.js';
 export * from './input-toggle/index.js';
 export * from './input-upload-field/index.js';
 export * from './multiple-color-picker-input/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/entry-point.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/entry-point.ts
index dc6d64c9b3..a6a004ace8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/entry-point.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/entry-point.ts
@@ -1,2 +1 @@
 import './checkbox-list/components/index.js';
-import './tree-picker/components/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tree-picker-source/index.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/input-tree-picker-source/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/input-tree-picker-source/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/input-tree-picker-source/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tree-picker-source/input-tree-picker-source.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/input-tree-picker-source/input-tree-picker-source.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/input-tree-picker-source/input-tree-picker-source.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/input-tree-picker-source/input-tree-picker-source.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts
index d8b1002fda..9a4c91db81 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts
@@ -1,4 +1,7 @@
-import type { UmbInputTreePickerSourceElement, UmbTreePickerSource } from '@umbraco-cms/backoffice/components';
+import type {
+	UmbInputTreePickerSourceElement,
+	UmbTreePickerSource,
+} from './input-tree-picker-source/input-tree-picker-source.element.js';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import {
@@ -7,6 +10,9 @@ import {
 } from '@umbraco-cms/backoffice/property-editor';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
+// import of local component
+import './input-tree-picker-source/index.js';
+
 /**
  * @element umb-property-editor-ui-tree-picker-source-picker
  */
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/property-editor-ui-tree-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/property-editor-ui-tree-picker.element.ts
index 6e0b1b4a25..6cc9d17564 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/property-editor-ui-tree-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/property-editor-ui-tree-picker.element.ts
@@ -8,6 +8,9 @@ import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbTreePickerSource } from '@umbraco-cms/backoffice/components';
 
+// import of local component
+import './components/input-tree/index.js';
+
 /**
  * @element umb-property-editor-ui-tree-picker
  */