diff --git a/src/g_game.c b/src/g_game.c
index b309daae3..eaa15ebe7 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4377,8 +4377,6 @@ static void G_DoCompleted(void)
 
 	// Then, update some important game state.
 	{
-		legitimateexit = false;
-
 		if (modeattacking && pausedelay)
 			pausedelay = 0;
 
@@ -4450,6 +4448,9 @@ static void G_DoCompleted(void)
 		tutorialchallenge = TUTORIALSKIP_NONE;
 	}
 
+	// This can now be set.
+	legitimateexit = false;
+
 	if (!demo.playback)
 	{
 		// Set up power level gametype scrambles
diff --git a/src/k_kart.c b/src/k_kart.c
index f1b357f51..6084a259d 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -398,9 +398,6 @@ boolean K_IsPlayerLosing(player_t *player)
 	if (specialstageinfo.valid == true)
 		return false; // anything short of DNF is COOL
 
-	if (tutorialchallenge == TUTORIALSKIP_INPROGRESS)
-		return true; // anything short of perfect is SUCK
-
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i] || players[i].spectator)