diff --git a/src/g_game.c b/src/g_game.c
index b5b7df905..73db462bf 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4331,7 +4331,11 @@ void G_NextLevel(void)
 	if (
 		gametype == GT_TUTORIAL
 		&& nextmap == NEXTMAP_TUTORIALCHALLENGE
-		&& !(gamedata && gamedata->enteredtutorialchallenge)
+		&& (
+			!gamedata
+			|| gamedata->enteredtutorialchallenge == false
+			|| M_GameTrulyStarted() == true
+		)
 	)
 	{
 		nextmap = G_MapNumber(tutorialchallengemap);