diff --git a/Content.Server/Mapping/MappingCommand.cs b/Content.Server/Mapping/MappingCommand.cs
index c68d01c4ba..e4a4cd8942 100644
--- a/Content.Server/Mapping/MappingCommand.cs
+++ b/Content.Server/Mapping/MappingCommand.cs
@@ -118,7 +118,10 @@ namespace Content.Server.Mapping
 
             var cfg = IoCManager.Resolve<IConfigurationManager>();
 
+            // don't interrupt mapping with events or auto-shuttle
             shell.ExecuteCommand("sudo cvar events.enabled false");
+            shell.ExecuteCommand("sudo cvar shuttle.auto_call_time 0");
+
             if (cfg.GetCVar(CCVars.AutosaveEnabled))
                 shell.ExecuteCommand($"toggleautosave {mapId} {toLoad ?? "NEWMAP"}");
             shell.ExecuteCommand($"tp 0 0 {mapId}");