diff --git a/src/d_main.c b/src/d_main.c
index 4b450eb06..23d4562b5 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1908,7 +1908,7 @@ void D_SRB2Main(void)
 				I_Error("Can't get first map of gametype\n");
 			}
 
-			if (M_MapLocked(pstartmap))
+			if (pstartmap != 1 && M_MapLocked(pstartmap))
 			{
 				G_SetUsedCheats();
 			}
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 258521d27..8fddc2794 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2821,7 +2821,7 @@ static void Command_Map_f(void)
 		return;
 	}
 
-	if (M_MapLocked(newmapnum))
+	if (/*newmapnum != 1 &&*/ M_MapLocked(newmapnum))
 	{
 		ischeating = true;
 	}
diff --git a/src/m_cond.c b/src/m_cond.c
index 6ddbed1f9..c0d40ed5e 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -1851,7 +1851,7 @@ boolean M_MapLocked(UINT16 mapnum)
 	if (marathonmode)
 		return false;
 
-	if (mapnum <= 1 || mapnum > nummapheaders)
+	if (mapnum == 0 || mapnum > nummapheaders)
 		return false;
 	
 	if (!mapheaderinfo[mapnum-1])