diff --git a/amxmodx/CoreConfig.cpp b/amxmodx/CoreConfig.cpp
index ede4048dd..a2cbe222f 100644
--- a/amxmodx/CoreConfig.cpp
+++ b/amxmodx/CoreConfig.cpp
@@ -316,14 +316,10 @@ void CoreConfig::CheckLegacyBufferedCommand(char *command)
 		return;
 	}
 
-	if (!m_LegacyMainConfigExecuted && strstr(command, MainConfigFile))
+	if (!m_LegacyMainConfigExecuted && (strstr(command, MainConfigFile) ||  strstr(command, MapConfigDir)))
 	{
 		m_LegacyMainConfigExecuted = true;
-	}
-
-	if (!m_LegacyMapConfigsExecuted && strstr(command, MapConfigDir))
-	{
-		m_LegacyMapConfigsExecuted = true;
+		m_PendingForwardPush = true;
 	}
 }