diff --git a/src/Umbraco.Web.UI.Client/eslint.config.js b/src/Umbraco.Web.UI.Client/eslint.config.js
index 2dd76ea6e223..d4ad41a6f158 100644
--- a/src/Umbraco.Web.UI.Client/eslint.config.js
+++ b/src/Umbraco.Web.UI.Client/eslint.config.js
@@ -63,7 +63,7 @@ export default [
 			'local-rules/enforce-umbraco-external-imports': [
 				'error',
 				{
-					exceptions: ['@umbraco-cms', '@open-wc/testing', '@storybook', 'msw', '.', 'vite', 'uuid'],
+					exceptions: ['@umbraco-cms', '@open-wc/testing', '@storybook', 'msw', '.', 'vite', 'uuid', 'diff'],
 				},
 			],
 			'local-rules/exported-string-constant-naming': [
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 0e4176ecb83a..f2c82691437a 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -115,7 +115,6 @@
 		"./webhook": "./dist-cms/packages/webhook/index.js",
 		"./workspace": "./dist-cms/packages/core/workspace/index.js",
 		"./external/backend-api": "./dist-cms/external/backend-api/index.js",
-		"./external/base64-js": "./dist-cms/external/base64-js/index.js",
 		"./external/dompurify": "./dist-cms/external/dompurify/index.js",
 		"./external/lit": "./dist-cms/external/lit/index.js",
 		"./external/marked": "./dist-cms/external/marked/index.js",
diff --git a/src/Umbraco.Web.UI.Client/src/external/base64-js/index.ts b/src/Umbraco.Web.UI.Client/src/external/openid/base64-js/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/external/base64-js/index.ts
rename to src/Umbraco.Web.UI.Client/src/external/openid/base64-js/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/external/openid/crypto_utils.ts b/src/Umbraco.Web.UI.Client/src/external/openid/crypto_utils.ts
index 1f390ce8900c..c3cba472f6ff 100644
--- a/src/Umbraco.Web.UI.Client/src/external/openid/crypto_utils.ts
+++ b/src/Umbraco.Web.UI.Client/src/external/openid/crypto_utils.ts
@@ -13,8 +13,7 @@
  * limitations under the License.
  */
 
-import { fromByteArray } from '@umbraco-cms/backoffice/external/base64-js';
-
+import { fromByteArray } from './base64-js/index.js';
 import { AppAuthError } from './errors.js';
 
 const HAS_CRYPTO = typeof window !== 'undefined' && !!(window.crypto as any);
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index bb8d652c8465..870cc277c4c0 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -144,7 +144,6 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 			"@umbraco-cms/backoffice/webhook": ["./src/packages/webhook/index.ts"],
 			"@umbraco-cms/backoffice/workspace": ["./src/packages/core/workspace/index.ts"],
 			"@umbraco-cms/backoffice/external/backend-api": ["./src/external/backend-api/index.ts"],
-			"@umbraco-cms/backoffice/external/base64-js": ["./src/external/base64-js/index.ts"],
 			"@umbraco-cms/backoffice/external/dompurify": ["./src/external/dompurify/index.ts"],
 			"@umbraco-cms/backoffice/external/lit": ["./src/external/lit/index.ts"],
 			"@umbraco-cms/backoffice/external/marked": ["./src/external/marked/index.ts"],