diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs
index ca7f7271..fab88744 100644
--- a/NewHorizons/Main.cs
+++ b/NewHorizons/Main.cs
@@ -998,9 +998,13 @@ namespace NewHorizons
             {
                 CurrentStarSystem = _defaultSystemOverride;
 
-                if (BodyDict.TryGetValue(_defaultSystemOverride, out var bodies) && bodies.Any(x => x.Config?.Spawn?.shipSpawn != null))
+                // #738 - Sometimes the override will not support spawning regularly, so always warp in if possible
+                if (SystemDict[_defaultSystemOverride].Config.Vessel?.spawnOnVessel == true)
+                {
+                    IsWarpingFromVessel = true;
+                }
+                else if (BodyDict.TryGetValue(_defaultSystemOverride, out var bodies) && bodies.Any(x => x.Config?.Spawn?.shipSpawn != null))
                 {
-                    // #738 - Sometimes the override will not support spawning regularly, so always warp in if possible
                     IsWarpingFromShip = true;
                 }
                 else