diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index f49e6df5a2..951c55270b 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -47,7 +47,7 @@ const loadBudibase = async () => {
   appStore.actions.setAppId(window["##BUDIBASE_APP_ID##"])
 
   // Fetch environment info
-  if (!get(environmentStore)) {
+  if (!get(environmentStore)?.loaded) {
     await environmentStore.actions.fetchEnvironment()
   }
 
diff --git a/packages/client/src/stores/environment.js b/packages/client/src/stores/environment.js
index ebeb67c622..bcc1493cd9 100644
--- a/packages/client/src/stores/environment.js
+++ b/packages/client/src/stores/environment.js
@@ -2,6 +2,7 @@ import { API } from "api"
 import { writable } from "svelte/store"
 
 const initialState = {
+  loaded: false,
   cloud: false,
 }
 
@@ -15,6 +16,7 @@ const createEnvironmentStore = () => {
         store.set({
           ...initialState,
           ...environment,
+          loaded: true,
         })
       } catch (error) {
         store.set(initialState)