diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
index 33efb5e7fb..c1a31f7059 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
@@ -11,9 +11,8 @@ import {
 	UmbPickerModalValue,
 } from '@umbraco-cms/backoffice/modal';
 import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
-import { ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 
-export class UmbPickerInputContext<ItemType extends ItemResponseModelBaseModel> extends UmbBaseController {
+export class UmbPickerInputContext<ItemType> extends UmbBaseController {
 	// TODO: We are way too unsecure about the requirements for the Modal Token, as we have certain expectation for the data and value.
 	modalAlias: string | UmbModalToken<UmbPickerModalData<ItemType>, UmbPickerModalValue>;
 	repository?: UmbItemRepository<ItemType>;
@@ -43,6 +42,8 @@ export class UmbPickerInputContext<ItemType extends ItemResponseModelBaseModel>
 	) {
 		super(host);
 		this.modalAlias = modalAlias;
+		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+		//@ts-ignore
 		this.#getUnique = getUniqueMethod || ((entry) => entry.id || '');
 
 		this.#itemManager = new UmbRepositoryItemsManager<ItemType>(host, repositoryAlias, this.#getUnique);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
index 64423e3020..e4adf40391 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts
@@ -2,10 +2,9 @@ import type { UmbItemRepository } from '@umbraco-cms/backoffice/repository';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbArrayState, UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
 import { type ManifestRepository, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
-import { type ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api';
 
-export class UmbRepositoryItemsManager<ItemType extends ItemResponseModelBaseModel> {
+export class UmbRepositoryItemsManager<ItemType> {
 	host: UmbControllerHost;
 	repository?: UmbItemRepository<ItemType>;
 	#getUnique: (entry: ItemType) => string | undefined;
@@ -33,6 +32,8 @@ export class UmbRepositoryItemsManager<ItemType extends ItemResponseModelBaseMod
 		getUniqueMethod?: (entry: ItemType) => string | undefined,
 	) {
 		this.host = host;
+		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+		//@ts-ignore
 		this.#getUnique = getUniqueMethod || ((entry) => entry.id || '');
 
 		this.#init = new UmbExtensionApiInitializer<ManifestRepository<UmbItemRepository<ItemType>>>(