diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs
index b5b4798364..26dfd68b60 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.cs
@@ -236,10 +236,11 @@ namespace Content.Server.Shuttles.Systems
             if (!component.Docked)
                 return;
 
-            var other = Comp<DockingComponent>(component.DockedWith!.Value);
+            var otherDock = component.DockedWith;
+            var other = Comp<DockingComponent>(otherDock!.Value);
 
             Undock(uid, component);
-            Dock(uid, component, component.DockedWith.Value, other);
+            Dock(uid, component, otherDock.Value, other);
             _console.RefreshShuttleConsoles();
         }