diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
index d66d4361db..e59380f0c6 100644
--- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
@@ -47,6 +47,9 @@ export class CipherContextMenuHandler {
       apiServiceOptions: {
         logoutCallback: NOT_IMPLEMENTED,
       },
+      tokenServiceOptions: {
+        logoutCallback: NOT_IMPLEMENTED,
+      },
       cryptoFunctionServiceOptions: {
         win: self,
       },
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
index 5ba48a9f27..303bf315ee 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
@@ -99,6 +99,9 @@ export class ContextMenuClickedHandler {
       keyConnectorServiceOptions: {
         logoutCallback: NOT_IMPLEMENTED,
       },
+      tokenServiceOptions: {
+        logoutCallback: NOT_IMPLEMENTED,
+      },
       logServiceOptions: {
         isDev: false,
       },
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
index 9422756e07..65811bc160 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
@@ -184,6 +184,9 @@ export class MainContextMenuHandler {
         logServiceOptions: {
           isDev: false,
         },
+        tokenServiceOptions: {
+          logoutCallback: () => Promise.resolve(),
+        },
         stateServiceOptions: {
           stateFactory: stateFactory,
         },
diff --git a/apps/browser/src/platform/listeners/on-command-listener.ts b/apps/browser/src/platform/listeners/on-command-listener.ts
index fc2939dce8..0a0b223583 100644
--- a/apps/browser/src/platform/listeners/on-command-listener.ts
+++ b/apps/browser/src/platform/listeners/on-command-listener.ts
@@ -53,6 +53,9 @@ const doAutoFillLogin = async (tab: chrome.tabs.Tab): Promise<void> => {
     keyConnectorServiceOptions: {
       logoutCallback: () => Promise.resolve(),
     },
+    tokenServiceOptions: {
+      logoutCallback: () => Promise.resolve(),
+    },
     i18nServiceOptions: {
       systemLanguage: BrowserApi.getUILanguage(),
     },
@@ -91,6 +94,9 @@ const doGeneratePasswordToClipboard = async (tab: chrome.tabs.Tab): Promise<void
       clipboardWriteCallback: () => Promise.resolve(),
       win: self,
     },
+    tokenServiceOptions: {
+      logoutCallback: () => Promise.resolve(),
+    },
     stateServiceOptions: {
       stateFactory: stateFactory,
     },
diff --git a/apps/browser/src/platform/listeners/update-badge.ts b/apps/browser/src/platform/listeners/update-badge.ts
index c39cb8c894..4b1c4400b4 100644
--- a/apps/browser/src/platform/listeners/update-badge.ts
+++ b/apps/browser/src/platform/listeners/update-badge.ts
@@ -288,6 +288,9 @@ export class UpdateBadge {
       keyConnectorServiceOptions: {
         logoutCallback: () => Promise.reject("not implemented"),
       },
+      tokenServiceOptions: {
+        logoutCallback: () => Promise.reject("not implemented"),
+      },
       i18nServiceOptions: {
         systemLanguage: BrowserApi.getUILanguage(),
       },