diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs
index fcef89f18..712378c76 100644
--- a/Aetheria.State.Verify/Program.cs
+++ b/Aetheria.State.Verify/Program.cs
@@ -4406,6 +4406,7 @@ static void RequireTradeCargoSelectorUseEveSurface(string root)
         "AetheriaRuntimeTradeCargoSelectorCommandKind.Close",
         "AetheriaRuntimeTradeCargoSelectorCommandKind.Select",
         "CountAvailablePlayerShips(",
+        "GameManager.IsObservedDocked",
         "GameManager.AvailableEntities()"
     };
 
@@ -4434,7 +4435,8 @@ static void RequireTradeCargoSelectorUseEveSurface(string root)
         "string.Equals(request.Command, AetheriaRuntimeTradeCargoSelectorSurfaceBuilder.Close",
         "_cargoSelectionCommands.TryGetValue(request.Command",
         "GameManager.DockedEntity.Children",
-        "GameManager.CurrentEntity.Parent.Children"
+        "GameManager.CurrentEntity.Parent.Children",
+        "GameManager.DockedEntity == null"
     };
 
     var hits = forbiddenSymbols
diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs
index 82fe9dfa6..2438f6865 100644
--- a/Assets/Scripts/UI/Menu/TradeMenu.cs
+++ b/Assets/Scripts/UI/Menu/TradeMenu.cs
@@ -48,7 +48,7 @@ public class TradeMenu : MonoBehaviour
     
     private void OnEnable()
     {
-        if (GameManager.DockedEntity == null) return;
+        if (!GameManager.IsObservedDocked) return;
         _targetCargo = GameManager.DockingBay;
         TargetCargoLabel.text = "Docking Bay";
         HideCargoSelectorSurface();