diff --git a/src/main/menu.main.ts b/src/main/menu.main.ts
index 302978e1211..1035aa68c02 100644
--- a/src/main/menu.main.ts
+++ b/src/main/menu.main.ts
@@ -74,10 +74,14 @@ export class MenuMain extends BaseMenu {
 
     updateApplicationMenuState(isAuthenticated: boolean, isLocked: boolean) {
         this.unlockedRequiredMenuItems.forEach((mi: MenuItem) => {
-            mi.enabled = isAuthenticated && !isLocked;
+            if (mi != null) {
+                mi.enabled = isAuthenticated && !isLocked;
+            }
         });
 
-        this.logOut.enabled = isAuthenticated;
+        if (this.logOut != null) {
+            this.logOut.enabled = isAuthenticated;
+        }
     }
 
     private initApplicationMenu() {