diff --git a/src/background/main.background.ts b/src/background/main.background.ts
index 901c31ee0f..36f68bc402 100644
--- a/src/background/main.background.ts
+++ b/src/background/main.background.ts
@@ -210,12 +210,12 @@ export default class MainBackground {
         }
 
         const isAuthenticated = await this.userService.isAuthenticated();
-        const key = await this.cryptoService.getKey();
+        const hasKey = await this.cryptoService.hasKey();
 
         let suffix = '';
         if (!isAuthenticated) {
             suffix = '_gray';
-        } else if (!key) {
+        } else if (!hasKey) {
             suffix = '_locked';
         }
 
diff --git a/src/popup/services/launch-guard.service.ts b/src/popup/services/launch-guard.service.ts
index 0f045482fa..64db076337 100644
--- a/src/popup/services/launch-guard.service.ts
+++ b/src/popup/services/launch-guard.service.ts
@@ -24,8 +24,8 @@ export class LaunchGuardService implements CanActivate {
             return true;
         }
 
-        const key = await this.cryptoService.getKey();
-        if (key == null) {
+        const hasKey = await this.cryptoService.hasKey();
+        if (!hasKey) {
             this.router.navigate(['lock']);
         } else {
             this.router.navigate(['tabs/current']);