diff --git a/NewHorizons/Builder/General/SpawnPointBuilder.cs b/NewHorizons/Builder/General/SpawnPointBuilder.cs
index 591defb4..536582aa 100644
--- a/NewHorizons/Builder/General/SpawnPointBuilder.cs
+++ b/NewHorizons/Builder/General/SpawnPointBuilder.cs
@@ -65,6 +65,13 @@ namespace NewHorizons.Builder.General
                     }
 
                     ship.GetRequiredComponent<MatchInitialMotion>().SetBodyToMatch(owRigidBody);
+
+                    // Might fix #648
+                    var fogWarpVolume = planetGO.GetComponentInChildren<OuterFogWarpVolume>();
+                    if (fogWarpVolume != null)
+                    {
+                        ship.GetComponentInChildren<FogWarpDetector>().TrackFogWarpVolume(fogWarpVolume);
+                    }
                 }
                 spawnGO.SetActive(true);