diff --git a/src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala b/src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala
index d90baa787..2a9e9cd97 100644
--- a/src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala
+++ b/src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala
@@ -61,8 +61,10 @@ trait CargoBehavior {
 
   def startCargoDismounting(bailed: Boolean): Unit = {
     if (!startCargoDismountingNoCleanup(bailed)) {
-      isDismounting = None
-      CargoObject.MountedIn = None
+      CargoObject.Zone.GUID(CargoObject.MountedIn).orElse {
+        isDismounting = None
+        CargoObject.MountedIn = None
+      }
     }
   }