diff --git a/NewHorizons/Handlers/VesselWarpHandler.cs b/NewHorizons/Handlers/VesselWarpHandler.cs
index eafc8484..5ede4fba 100644
--- a/NewHorizons/Handlers/VesselWarpHandler.cs
+++ b/NewHorizons/Handlers/VesselWarpHandler.cs
@@ -27,7 +27,12 @@ namespace NewHorizons.Handlers
 
         public static void LoadVessel()
         {
-            if (Instance.CurrentStarSystem == "EyeOfTheUniverse") return SearchUtilities.Find("Vessel_Body/SPAWN_Vessel").GetComponent<EyeSpawnPoint>();
+            if (Instance.CurrentStarSystem == "EyeOfTheUniverse")
+            {
+                _vesselSpawnPoint = SearchUtilities.Find("Vessel_Body/SPAWN_Vessel").GetComponent<EyeSpawnPoint>();
+                return;
+            }
+
             if (Instance.IsWarpingFromVessel)
                 _vesselSpawnPoint = Instance.CurrentStarSystem == "SolarSystem" ? UpdateVessel() : CreateVessel();
             else
diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs
index 1af5e4a7..bd438270 100644
--- a/NewHorizons/Main.cs
+++ b/NewHorizons/Main.cs
@@ -336,7 +336,7 @@ namespace NewHorizons
                 BrambleNodeBuilder.Init(BodyDict[CurrentStarSystem].Select(x => x.Config).Where(x => x.Bramble?.dimension != null).ToArray());
 
                 PlanetCreationHandler.Init(BodyDict[CurrentStarSystem]);
-                if (isSolarSystem) VesselWarpHandler.LoadVessel();
+                VesselWarpHandler.LoadVessel();
                 SystemCreationHandler.LoadSystem(SystemDict[CurrentStarSystem]);
 
                 LoadTranslations(ModHelper.Manifest.ModFolderPath + "Assets/", this);