diff --git a/desktop/flipper-ui-browser/src/global.tsx b/desktop/flipper-ui-browser/src/global.tsx
index 566fd8657..7f7b0a1ae 100644
--- a/desktop/flipper-ui-browser/src/global.tsx
+++ b/desktop/flipper-ui-browser/src/global.tsx
@@ -17,12 +17,12 @@ declare global {
       theme: 'light' | 'dark' | 'system';
       entryPoint: string;
       debug: boolean;
+      GRAPH_SECRET: string;
+      FLIPPER_APP_VERSION: string;
+      FLIPPER_SESSION_ID: string;
+      FLIPPER_UNIXNAME: string;
+      FLIPPER_AUTH_TOKEN: string;
     };
-    GRAPH_SECRET: string;
-    FLIPPER_APP_VERSION: string;
-    FLIPPER_SESSION_ID: string;
-    FLIPPER_UNIXNAME: string;
-    FLIPPER_AUTH_TOKEN: string;
 
     flipperShowMessage?(message: {title?: string; detail?: string}): void;
     flipperHideMessage?(): void;
diff --git a/desktop/flipper-ui-browser/src/index.tsx b/desktop/flipper-ui-browser/src/index.tsx
index c07298a8f..ef24f2202 100644
--- a/desktop/flipper-ui-browser/src/index.tsx
+++ b/desktop/flipper-ui-browser/src/index.tsx
@@ -56,7 +56,7 @@ async function start() {
     let token = providerParams.get('token');
     if (!token) {
       console.info('[flipper-client][ui-browser] Get token from HTML instead');
-      token = window.FLIPPER_AUTH_TOKEN;
+      token = window.flipperConfig.FLIPPER_AUTH_TOKEN;
       if (!token || token === 'FLIPPER_AUTH_TOKEN_REPLACE_ME') {
         console.warn(
           '[flipper-client][ui-browser] Failed to get token from HTML',
diff --git a/desktop/static/index.web.dev.html b/desktop/static/index.web.dev.html
index e79cd0932..b90b3afd0 100644
--- a/desktop/static/index.web.dev.html
+++ b/desktop/static/index.web.dev.html
@@ -18,6 +18,11 @@
       theme: 'light',
       entryPoint: 'flipper-ui-browser/src/index-fast-refresh.bundle?platform=web&dev=true&minify=false',
       debug: true,
+      GRAPH_SECRET: 'GRAPH_SECRET_REPLACE_ME',
+      FLIPPER_APP_VERSION: 'FLIPPER_APP_VERSION_REPLACE_ME',
+      FLIPPER_SESSION_ID: 'FLIPPER_SESSION_ID_REPLACE_ME',
+      FLIPPER_UNIXNAME: 'FLIPPER_UNIXNAME_REPLACE_ME',
+      FLIPPER_AUTH_TOKEN: 'FLIPPER_AUTH_TOKEN_REPLACE_ME',
     }
   </script>
   <style>
@@ -155,16 +160,10 @@
         window.flipperShowMessage = showMessage;
         window.flipperHideMessage = hideMessage;
 
-        window.GRAPH_SECRET = 'GRAPH_SECRET_REPLACE_ME';
-        window.FLIPPER_APP_VERSION = 'FLIPPER_APP_VERSION_REPLACE_ME';
-        window.FLIPPER_SESSION_ID = 'FLIPPER_SESSION_ID_REPLACE_ME';
-        window.FLIPPER_UNIXNAME = 'FLIPPER_UNIXNAME_REPLACE_ME';
-        window.FLIPPER_AUTH_TOKEN = 'FLIPPER_AUTH_TOKEN_REPLACE_ME';
-
         const params = new URL(location.href).searchParams;
         let token = params.get('token');
         if (!token) {
-          token = window.FLIPPER_AUTH_TOKEN
+          token = window.flipperConfig.FLIPPER_AUTH_TOKEN
         }
 
         const socket = new WebSocket(`ws://${location.host}?token=${token}`);
diff --git a/desktop/static/index.web.html b/desktop/static/index.web.html
index ec7fda6e4..921a5b11a 100644
--- a/desktop/static/index.web.html
+++ b/desktop/static/index.web.html
@@ -18,6 +18,11 @@
       theme: 'light',
       entryPoint: 'bundle.js',
       debug: false,
+      GRAPH_SECRET: 'GRAPH_SECRET_REPLACE_ME',
+      FLIPPER_APP_VERSION: 'FLIPPER_APP_VERSION_REPLACE_ME',
+      FLIPPER_SESSION_ID: 'FLIPPER_SESSION_ID_REPLACE_ME',
+      FLIPPER_UNIXNAME: 'FLIPPER_UNIXNAME_REPLACE_ME',
+      FLIPPER_AUTH_TOKEN: 'FLIPPER_AUTH_TOKEN_REPLACE_ME',
     }
   </script>
   <style>
@@ -103,12 +108,6 @@
         window.flipperShowMessage = showMessage;
         window.flipperHideMessage = hideMessage;
 
-        window.GRAPH_SECRET = 'GRAPH_SECRET_REPLACE_ME';
-        window.FLIPPER_APP_VERSION = 'FLIPPER_APP_VERSION_REPLACE_ME';
-        window.FLIPPER_SESSION_ID = 'FLIPPER_SESSION_ID_REPLACE_ME';
-        window.FLIPPER_UNIXNAME = 'FLIPPER_UNIXNAME_REPLACE_ME';
-        window.FLIPPER_AUTH_TOKEN = 'FLIPPER_AUTH_TOKEN_REPLACE_ME';
-
         // load correct theme (n.b. this doesn't handle system value specifically, will assume light in such cases)
         try {
           if (window.flipperConfig.theme === 'dark') {