diff --git a/Umbra.Game/src/MainMenu/MainMenuItem.cs b/Umbra.Game/src/MainMenu/MainMenuItem.cs
index a0619fb..3bf0e57 100644
--- a/Umbra.Game/src/MainMenu/MainMenuItem.cs
+++ b/Umbra.Game/src/MainMenu/MainMenuItem.cs
@@ -128,9 +128,11 @@ public unsafe void Update()
         AgentHUD* agentHud = AgentHUD.Instance();
         if (agentHud == null) return;
 
+        if (CommandId == null) return;
+
         IsDisabled = false
             == (
-                agentHud->IsMainCommandEnabled(CommandId!.Value) && uiModule->IsMainCommandUnlocked(CommandId!.Value)
+                agentHud->IsMainCommandEnabled(CommandId.Value) && uiModule->IsMainCommandUnlocked(CommandId.Value)
             );
 
         if (CommandId == 36) {