diff --git a/PugSharp/PugSharp.cs b/PugSharp/PugSharp.cs
index e6e30cf1..546e29ff 100644
--- a/PugSharp/PugSharp.cs
+++ b/PugSharp/PugSharp.cs
@@ -429,7 +429,10 @@ public void SwitchMap(string selectedMap)
 
         if (_Match != null)
         {
-            SetMatchVariable(_Match.Config);
+            Server.NextFrame(() =>
+            {
+                SetMatchVariable(_Match.Config);
+            });
         }
     }