diff --git a/scripting/get5/matchconfig.sp b/scripting/get5/matchconfig.sp
index 52e1c9e8f..ed3c62052 100644
--- a/scripting/get5/matchconfig.sp
+++ b/scripting/get5/matchconfig.sp
@@ -38,7 +38,7 @@ stock bool LoadMatchConfig(const char[] config, bool restoreBackup = false) {
 
   g_ReadyTimeWaitingUsed = 0;
   g_HasKnifeRoundStarted = false;
-
+  g_MapChangePending = false;
   g_MapNumber = 0;
   g_RoundNumber = -1;
   g_LastVetoTeam = Get5Team_2;
diff --git a/scripting/get5/readysystem.sp b/scripting/get5/readysystem.sp
index 3fea5ee67..39042b28b 100644
--- a/scripting/get5/readysystem.sp
+++ b/scripting/get5/readysystem.sp
@@ -8,7 +8,7 @@ public void ResetReadyStatus() {
 }
 
 public bool IsReadyGameState() {
-  return g_GameState == Get5State_PreVeto || g_GameState == Get5State_Warmup;
+  return (g_GameState == Get5State_PreVeto || g_GameState == Get5State_Warmup) && !g_MapChangePending;
 }
 
 // Client ready status