diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 4bb950d8e..8a9598174 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -7645,7 +7645,9 @@ static void P_InitLevelSettings(void)
 
 	// circuit, race and competition stuff
 	numcheatchecks = 0;
-	timeinmap = 0;
+
+	if (!g_reloadinggamestate)
+		timeinmap = 0;
 
 	// special stage
 	stagefailed = true; // assume failed unless proven otherwise - P_GiveEmerald or emerald touchspecial
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 28c691f13..21e0669b1 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1516,10 +1516,10 @@ static fixed_t ST_CalculateFadeIn(player_t *player)
 
 	if (K_CheckBossIntro() == true || G_IsTitleCardAvailable() == false)
 	{
-		if (leveltime <= 16)
+		if (timeinmap <= 16)
 			timer = 0;
 		else
-			timer = leveltime-16;
+			timer = timeinmap-16;
 	}
 
 	if (timer < length)