diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.ts
index 72810c091a..295818beee 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.ts
@@ -1,4 +1,4 @@
-import type { UmbContextToken } from '../token/context-token.js';
+import type { UmbContextToken } from '../token/index.js';
 import { UmbContextProvider } from './context-provider.js';
 import type { UmbControllerHost, UmbController } from '@umbraco-cms/backoffice/controller-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.element.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.element.ts
index 5d2097cab3..3ea771510d 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.element.ts
@@ -1,7 +1,7 @@
 import { UmbContextProviderController } from './context-provider.controller.js';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbControllerHostElementMixin } from '@umbraco-cms/backoffice/controller-api';
-import type { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+import type { UmbContextToken } from '../token/index.js';
 
 /**
  * Provides a value to the context down the DOM tree.
diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.ts
index 2a03422746..8faa782ac2 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.ts
@@ -1,6 +1,6 @@
 import type { UmbContextRequestEvent } from '../consume/context-request.event.js';
 import { UMB_CONTENT_REQUEST_EVENT_TYPE, UMB_DEBUG_CONTEXT_EVENT_TYPE } from '../consume/context-request.event.js';
-import type { UmbContextToken } from '../token/context-token.js';
+import type { UmbContextToken } from '../token/index.js';
 import {
 	UmbContextProvideEventImplementation,
 	//UmbContextUnprovidedEventImplementation,
diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/index.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/index.ts
index 7532583420..1b23b3d4ba 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/index.ts
@@ -1,4 +1,3 @@
 export * from './context-provider.controller.js';
 export * from './context-provider.js';
 export * from './context-provide.event.js';
-export * from './context-provider.element.js';