diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
index 2726eaa1c2..0622398f75 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
@@ -74,7 +74,6 @@ export class UmbAppElement extends UmbLitElement {
 
 	async #setup() {
 		if (this.serverUrl === undefined) throw new Error('No serverUrl provided');
-		OpenAPI.BASE = this.serverUrl;
 		const redirectUrl = `${window.location.origin}${this.backofficePath}`;
 
 		this.#serverConnection = new UmbServerConnection(this.serverUrl);
diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts b/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts
index 48fb1d9bf4..04fbd4372a 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts
@@ -1,4 +1,4 @@
-import { RuntimeLevelModel, ServerResource } from '@umbraco-cms/backoffice/backend-api';
+import { OpenAPI, RuntimeLevelModel, ServerResource } from '@umbraco-cms/backoffice/backend-api';
 import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
 import { tryExecute } from '@umbraco-cms/backoffice/resources';
 
@@ -11,6 +11,7 @@ export class UmbServerConnection {
 
 	constructor(serverUrl: string) {
 		this.#url = serverUrl;
+		OpenAPI.BASE = this.#url;
 	}
 
 	/**