diff --git a/src/main/messaging.main.ts b/src/main/messaging.main.ts
index 695fbcc562..8a6e254656 100644
--- a/src/main/messaging.main.ts
+++ b/src/main/messaging.main.ts
@@ -54,6 +54,9 @@ export class MessagingMain {
     }
 
     private updateTrayMenu(isAuthenticated: boolean, isLocked: boolean) {
+        if (this.main.trayMain == null || this.main.trayMain.contextMenu == null) {
+            return;
+        }
         const lockNowTrayMenuItem = this.main.trayMain.contextMenu.getMenuItemById('lockNow');
         if (lockNowTrayMenuItem != null) {
             lockNowTrayMenuItem.enabled = isAuthenticated && !isLocked;