diff --git a/libs/common/src/billing/models/billing-keys.state.ts b/libs/common/src/billing/models/billing-keys.state.ts
index 8367ff7fbe..1d1cce6d0b 100644
--- a/libs/common/src/billing/models/billing-keys.state.ts
+++ b/libs/common/src/billing/models/billing-keys.state.ts
@@ -1,7 +1,7 @@
-import { BILLING_DISK, KeyDefinition } from "../../platform/state";
+import { BILLING_DISK, UserKeyDefinition } from "../../platform/state";
 import { PaymentMethodWarning } from "../models/domain/payment-method-warning";
 
-export const PAYMENT_METHOD_WARNINGS_KEY = KeyDefinition.record<PaymentMethodWarning>(
+export const PAYMENT_METHOD_WARNINGS_KEY = UserKeyDefinition.record<PaymentMethodWarning>(
   BILLING_DISK,
   "paymentMethodWarnings",
   {
@@ -9,5 +9,6 @@ export const PAYMENT_METHOD_WARNINGS_KEY = KeyDefinition.record<PaymentMethodWar
       ...warnings,
       savedAt: new Date(warnings.savedAt),
     }),
+    clearOn: ["logout"],
   },
 );
diff --git a/libs/common/src/billing/services/account/billing-account-profile-state.service.ts b/libs/common/src/billing/services/account/billing-account-profile-state.service.ts
index 336021c993..cf05df2f22 100644
--- a/libs/common/src/billing/services/account/billing-account-profile-state.service.ts
+++ b/libs/common/src/billing/services/account/billing-account-profile-state.service.ts
@@ -3,19 +3,20 @@ import { map, Observable, of, switchMap } from "rxjs";
 import {
   ActiveUserState,
   BILLING_DISK,
-  KeyDefinition,
   StateProvider,
+  UserKeyDefinition,
 } from "../../../platform/state";
 import {
   BillingAccountProfile,
   BillingAccountProfileStateService,
 } from "../../abstractions/account/billing-account-profile-state.service";
 
-export const BILLING_ACCOUNT_PROFILE_KEY_DEFINITION = new KeyDefinition<BillingAccountProfile>(
+export const BILLING_ACCOUNT_PROFILE_KEY_DEFINITION = new UserKeyDefinition<BillingAccountProfile>(
   BILLING_DISK,
   "accountProfile",
   {
     deserializer: (billingAccountProfile) => billingAccountProfile,
+    clearOn: ["logout"],
   },
 );