diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index fa1e6c237c9..bd7b41b6e5f 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -321,6 +321,9 @@ export class AppComponent implements OnInit, OnDestroy {
   }
 
   private async clearComponentStates() {
+    if (this.activeUserId == null) {
+      return;
+    }
     if (!(await firstValueFrom(this.tokenService.hasAccessToken$(this.activeUserId)))) {
       return;
     }