diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index 010f1db5eb..a2b480f742 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { isActive, redirect, params } from "@roxi/routify"
-  import { admin, auth, licensing, tenants } from "stores/portal"
+  import { admin, auth, licensing } from "stores/portal"
   import { onMount } from "svelte"
   import { CookieUtils, Constants } from "@budibase/frontend-core"
   import { API } from "api"
@@ -10,24 +10,27 @@
 
   $: multiTenancyEnabled = $admin.multiTenancy
   $: hasAdminUser = $admin?.checklist?.adminUser?.checked
+  $: baseUrl = $admin?.baseUrl
   $: tenantSet = $auth.tenantSet
-  $: cloud = $admin.cloud
+  $: cloud = $admin?.cloud
   $: user = $auth.user
 
   $: useAccountPortal = cloud && !$admin.disableAccountPortal
 
   const validateTenantId = async () => {
     const host = window.location.host
-    if (host.includes("localhost:")) {
+    if (host.includes("localhost:") || !baseUrl) {
       // ignore local dev
       return
     }
 
-    // e.g. ['tenant', 'budibase', 'app'] vs ['budibase', 'app']
+    const mainHost = new URL(baseUrl).host
     let urlTenantId
-    const hostParts = host.split(".")
-    if (hostParts.length > 2) {
-      urlTenantId = hostParts[0]
+    // remove the main host part
+    const hostParts = host.split(mainHost).filter(part => part !== "")
+    // if there is a part left, it has to be the tenant ID subdomain
+    if (hostParts.length === 1) {
+      urlTenantId = hostParts[0].replace(/\./g, "")
     }
 
     if (user && user.tenantId) {
@@ -41,16 +44,15 @@
         return
       }
 
-      // check if real tenant
-      const { exists: tenantExists } = await tenants.info(urlTenantId)
-
-      if (tenantExists && user.tenantId !== urlTenantId) {
+      if (urlTenantId && user.tenantId !== urlTenantId) {
         // user should not be here - play it safe and log them out
         try {
           await auth.logout()
           await auth.setOrganisation(null)
         } catch (error) {
-          console.error("Tenant mis-match, logout.")
+          console.error(
+            `Tenant mis-match - "${urlTenantId}" and "${user.tenantId}" - logout`
+          )
         }
       }
     } else {
diff --git a/packages/builder/src/stores/portal/admin.js b/packages/builder/src/stores/portal/admin.js
index ba95db64b7..273d92f463 100644
--- a/packages/builder/src/stores/portal/admin.js
+++ b/packages/builder/src/stores/portal/admin.js
@@ -53,6 +53,7 @@ export function createAdminStore() {
       store.disableAccountPortal = environment.disableAccountPortal
       store.accountPortalUrl = environment.accountPortalUrl
       store.isDev = environment.isDev
+      store.baseUrl = environment.baseUrl
       return store
     })
   }
diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js
index 1a2914b925..e8f7853165 100644
--- a/packages/builder/src/stores/portal/index.js
+++ b/packages/builder/src/stores/portal/index.js
@@ -14,4 +14,3 @@ export { overview } from "./overview"
 export { environment } from "./environment"
 export { menu } from "./menu"
 export { auditLogs } from "./auditLogs"
-export { tenants } from "./tenants"
diff --git a/packages/builder/src/stores/portal/tenants.js b/packages/builder/src/stores/portal/tenants.js
deleted file mode 100644
index e93b48b144..0000000000
--- a/packages/builder/src/stores/portal/tenants.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { writable, get } from "svelte/store"
-import { API } from "api"
-
-export function tenantsStore() {
-  const store = writable({ tenantInfo: {} })
-
-  return {
-    info: async tenantId => {
-      if (!tenantId) {
-        return { exists: false }
-      }
-      const contents = get(store)
-      const found = contents.tenantInfo[tenantId]
-      if (found) {
-        return found
-      }
-      const tenantInfo = await API.getTenantInfo(tenantId)
-      store.update(state => {
-        state.tenantInfo[tenantId] = tenantInfo
-        return state
-      })
-      return tenantInfo
-    },
-  }
-}
-
-export const tenants = tenantsStore()
diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.js
index 66af4cd5c5..f8eee45cb8 100644
--- a/packages/frontend-core/src/api/index.js
+++ b/packages/frontend-core/src/api/index.js
@@ -29,7 +29,6 @@ import { buildBackupsEndpoints } from "./backups"
 import { buildEnvironmentVariableEndpoints } from "./environmentVariables"
 import { buildEventEndpoints } from "./events"
 import { buildAuditLogsEndpoints } from "./auditLogs"
-import { buildTenantEndpoints } from "./tenants"
 
 const defaultAPIClientConfig = {
   /**
@@ -254,6 +253,5 @@ export const createAPIClient = config => {
     ...buildEnvironmentVariableEndpoints(API),
     ...buildEventEndpoints(API),
     ...buildAuditLogsEndpoints(API),
-    ...buildTenantEndpoints(API),
   }
 }
diff --git a/packages/frontend-core/src/api/tenants.js b/packages/frontend-core/src/api/tenants.js
deleted file mode 100644
index 7a5095e94a..0000000000
--- a/packages/frontend-core/src/api/tenants.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export const buildTenantEndpoints = API => ({
-  /**
-   * Get information about a tenant
-   */
-  getTenantInfo: async tenantId => {
-    return await API.get({ url: `/api/system/tenants/${tenantId}/info` })
-  },
-})
diff --git a/packages/worker/src/api/controllers/system/environment.ts b/packages/worker/src/api/controllers/system/environment.ts
index 8ae0fcda3f..17cf73b5ed 100644
--- a/packages/worker/src/api/controllers/system/environment.ts
+++ b/packages/worker/src/api/controllers/system/environment.ts
@@ -7,6 +7,7 @@ export const fetch = async (ctx: BBContext) => {
     cloud: !env.SELF_HOSTED,
     accountPortalUrl: env.ACCOUNT_PORTAL_URL,
     disableAccountPortal: env.DISABLE_ACCOUNT_PORTAL,
+    baseUrl: env.PLATFORM_URL,
     // in test need to pretend its in production for the UI (Cypress)
     isDev: env.isDev() && !env.isTest(),
   }
diff --git a/packages/worker/src/api/routes/system/tenants.ts b/packages/worker/src/api/routes/system/tenants.ts
index 2d126b7f62..234459cfdc 100644
--- a/packages/worker/src/api/routes/system/tenants.ts
+++ b/packages/worker/src/api/routes/system/tenants.ts
@@ -10,6 +10,4 @@ router.delete(
   controller.destroy
 )
 
-router.get("/api/system/tenants/:tenantId/info", controller.info)
-
 export default router
diff --git a/packages/worker/src/api/routes/system/tests/tenants.spec.ts b/packages/worker/src/api/routes/system/tests/tenants.spec.ts
index 9b229201d4..af509b402e 100644
--- a/packages/worker/src/api/routes/system/tests/tenants.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/tenants.spec.ts
@@ -58,17 +58,4 @@ describe("/api/global/tenants", () => {
       expect(res.body).toEqual(config.adminOnlyResponse())
     })
   })
-
-  describe("GET /api/system/tenants/:tenantId/info", () => {
-    it("allows retrieving information about the tenant", async () => {
-      const user1 = await config.createTenant()
-      const res = await config.api.tenants.info(user1.tenantId)
-      expect(res.body.exists).toEqual(true)
-    })
-
-    it("check a tenant that doesn't exist", async () => {
-      const res = await config.api.tenants.info("cannot-exist-tenantid")
-      expect(res.body.exists).toEqual(false)
-    })
-  })
 })
diff --git a/packages/worker/src/tests/api/tenants.ts b/packages/worker/src/tests/api/tenants.ts
index 937982a527..16f970915a 100644
--- a/packages/worker/src/tests/api/tenants.ts
+++ b/packages/worker/src/tests/api/tenants.ts
@@ -14,11 +14,4 @@ export class TenantAPI extends TestAPI {
       .set(opts?.headers)
       .expect(opts?.status ? opts.status : 204)
   }
-
-  info = (tenantId: string) => {
-    return this.request
-      .get(`/api/system/tenants/${tenantId}/info`)
-      .set(this.config.defaultHeaders())
-      .expect(200)
-  }
 }