diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index a49d0bddd8..ac208df187 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server.Cargo.Components;
+using Content.Server.GameTicking.Events;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Shared.Stacks;
@@ -41,6 +42,8 @@ public sealed partial class CargoSystem
         SubscribeLocalEvent<CargoPalletConsoleComponent, BoundUIOpenedEvent>(OnPalletUIOpen);
 
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
+        SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
+
         _cfgManager.OnValueChanged(CCVars.GridFill, SetGridFill);
     }
 
@@ -371,7 +374,10 @@ public sealed partial class CargoSystem
     {
         Reset();
         CleanupCargoShuttle();
+    }
 
+    private void OnRoundStart(RoundStartingEvent ev)
+    {
         if (_cfgManager.GetCVar(CCVars.GridFill))
             SetupCargoShuttle();
     }