diff --git a/extension/background.js b/extension/background.js
index 007af21f..516ddb62 100644
--- a/extension/background.js
+++ b/extension/background.js
@@ -270,7 +270,7 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
   }
 
   if (msg.type === 'getPort') {
-    sendResponse({ port: serverPort, connected: isConnected });
+    sendResponse({ port: serverPort, connected: isConnected, token: authToken });
     return true;
   }
 
diff --git a/extension/sidepanel.js b/extension/sidepanel.js
index 1eead7d8..e39943f0 100644
--- a/extension/sidepanel.js
+++ b/extension/sidepanel.js
@@ -1396,8 +1396,7 @@ function tryConnect() {
   chrome.runtime.sendMessage({ type: 'getPort' }, (resp) => {
     if (resp && resp.port && resp.connected) {
       const url = `http://127.0.0.1:${resp.port}`;
-      // Token arrives via health broadcast from background.js
-      updateConnection(url, null);
+      updateConnection(url, resp.token || null);
     } else {
       setTimeout(tryConnect, 2000);
     }