diff --git a/apps/browser/src/tools/popup/services/key-definitions.ts b/apps/browser/src/tools/popup/services/key-definitions.ts
index 9b256073f3..b4ccd991e7 100644
--- a/apps/browser/src/tools/popup/services/key-definitions.ts
+++ b/apps/browser/src/tools/popup/services/key-definitions.ts
@@ -1,23 +1,25 @@
 import { Jsonify } from "type-fest";
 
-import { BROWSER_SEND_MEMORY, KeyDefinition } from "@bitwarden/common/platform/state";
+import { BROWSER_SEND_MEMORY, UserKeyDefinition } from "@bitwarden/common/platform/state";
 
 import { BrowserComponentState } from "../../../models/browserComponentState";
 import { BrowserSendComponentState } from "../../../models/browserSendComponentState";
 
-export const BROWSER_SEND_COMPONENT = new KeyDefinition<BrowserSendComponentState>(
+export const BROWSER_SEND_COMPONENT = new UserKeyDefinition<BrowserSendComponentState>(
   BROWSER_SEND_MEMORY,
   "browser_send_component",
   {
     deserializer: (obj: Jsonify<BrowserSendComponentState>) =>
       BrowserSendComponentState.fromJSON(obj),
+    clearOn: ["logout", "lock"],
   },
 );
 
-export const BROWSER_SEND_TYPE_COMPONENT = new KeyDefinition<BrowserComponentState>(
+export const BROWSER_SEND_TYPE_COMPONENT = new UserKeyDefinition<BrowserComponentState>(
   BROWSER_SEND_MEMORY,
   "browser_send_type_component",
   {
     deserializer: (obj: Jsonify<BrowserComponentState>) => BrowserComponentState.fromJSON(obj),
+    clearOn: ["logout", "lock"],
   },
 );