diff --git a/packages/host/app/components/operator-mode/container.gts b/packages/host/app/components/operator-mode/container.gts
index 8637c95a9c..0eb0e409fd 100644
--- a/packages/host/app/components/operator-mode/container.gts
+++ b/packages/host/app/components/operator-mode/container.gts
@@ -132,9 +132,6 @@ export default class OperatorModeContainer extends Component<Signature> {
     if (isTesting()) {
       return true;
     }
-    if (this.isUserInfoLoading) {
-      return false;
-    }
     return (
       !!this.billingService.subscriptionData?.stripeCustomerId &&
       !!this.billingService.subscriptionData?.plan
diff --git a/packages/host/app/services/billing-service.ts b/packages/host/app/services/billing-service.ts
index 28d046338e..9190771c9f 100644
--- a/packages/host/app/services/billing-service.ts
+++ b/packages/host/app/services/billing-service.ts
@@ -1,7 +1,7 @@
 import Owner from '@ember/owner';
 import Service from '@ember/service';
 import { service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
+import { tracked, cached } from '@glimmer/tracking';
 
 import { dropTask } from 'ember-concurrency';
 
@@ -55,6 +55,7 @@ export default class BillingService extends Service {
     return `${stripePaymentLink}?client_reference_id=${clientReferenceId}`;
   }
 
+  @cached
   get subscriptionData() {
     return this._subscriptionData;
   }