diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index aa7711d7f..618fc405b 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2529,7 +2529,7 @@ static void Command_Map_f(void)
 	newforcespecialstage = COM_CheckParm("-forcespecialstage");
 
 	usingcheats = CV_CheatsEnabled();
-	ischeating = (!(netgame || multiplayer)) || (!newresetplayers);
+	ischeating = (!(netgame || multiplayer)) || (!newresetplayers) || (!K_CanChangeRules(false));
 
 	if (!( first_option = COM_FirstOption() ))
 		first_option = COM_Argc();
@@ -2635,9 +2635,6 @@ static void Command_Map_f(void)
 		}
 	}
 
-	if (grandprixinfo.gp)
-		ischeating = true;
-
 	if (ischeating && !usingcheats)
 	{
 		CONS_Printf(M_GetText("Cheats must be enabled.\n"));