diff --git a/src/popup/app.component.ts b/src/popup/app.component.ts
index 9799e9d400..19ee5bf0bd 100644
--- a/src/popup/app.component.ts
+++ b/src/popup/app.component.ts
@@ -253,6 +253,10 @@ export class AppComponent implements OnInit {
   }
 
   private async clearComponentStates() {
+    if (!(await this.stateService.getIsAuthenticated())) {
+      return;
+    }
+
     await Promise.all([
       this.stateService.setBrowserGroupingComponentState(null),
       this.stateService.setBrowserCipherComponentState(null),