diff --git a/NewHorizons/Components/VesselOrbLocker.cs b/NewHorizons/Components/VesselOrbLocker.cs
index 6b36b2b7..2a2d8386 100644
--- a/NewHorizons/Components/VesselOrbLocker.cs
+++ b/NewHorizons/Components/VesselOrbLocker.cs
@@ -14,6 +14,14 @@ namespace NewHorizons.Components
         public GameObject _powerOrbObject;
         private NomaiInterfaceOrb _powerOrb;
 
+        private void Awake()
+        {
+            InitializeOrbs();
+            AddLocks();
+            RemoveLocks();
+            AddLockToWarpOrb();
+        }
+
         public void InitializeOrbs()
         {
             _coordinateInterfaceOrb = _coordinateInterfaceOrbObject.GetComponent<NomaiInterfaceOrb>();
diff --git a/NewHorizons/Handlers/VesselWarpHandler.cs b/NewHorizons/Handlers/VesselWarpHandler.cs
index f39feabd..579ee5a0 100644
--- a/NewHorizons/Handlers/VesselWarpHandler.cs
+++ b/NewHorizons/Handlers/VesselWarpHandler.cs
@@ -100,19 +100,12 @@ namespace NewHorizons.Handlers
             vesselAO.Register();
             vesselObject.GetComponentInChildren<ReferenceFrameVolume>(true)._referenceFrame._attachedAstroObject = vesselAO;
 
-            VesselOrbLocker vesselOrbLocker = vesselObject.GetComponent<VesselOrbLocker>();
-            vesselOrbLocker.InitializeOrbs();
-            vesselOrbLocker.AddLocks();
-
             if (system.Config.Vessel?.vesselPosition != null)
                 vesselObject.transform.position = system.Config.Vessel.vesselPosition;
 
             if (system.Config.Vessel?.vesselRotation != null)
                 vesselObject.transform.eulerAngles = system.Config.Vessel.vesselRotation;
 
-            vesselOrbLocker.RemoveLocks();
-            vesselOrbLocker.AddLockToWarpOrb();
-
             VesselSingularityRoot singularityRoot = vesselObject.GetComponentInChildren<VesselSingularityRoot>(true);
 
             VesselWarpController vesselWarpController = vesselObject.GetComponentInChildren<VesselWarpController>(true);