diff --git a/src/f_finale.c b/src/f_finale.c
index 93d2efd1f..e751084bc 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1475,6 +1475,8 @@ void F_StartTitleScreen(void)
 	INT32 titleMapNum;
 	setup_numplayers = 0;
 
+	encoremode = false;
+
 	if (gamestate != GS_TITLESCREEN && gamestate != GS_WAITINGPLAYERS)
 	{
 		ttuser_count = 0;
@@ -1495,9 +1497,6 @@ void F_StartTitleScreen(void)
 		titlemapinaction = true;
 		gamemap = titleMapNum+1;
 
-		maptol = mapheaderinfo[titleMapNum]->typeoflevel;
-		globalweather = mapheaderinfo[titleMapNum]->weather;
-
 		G_DoLoadLevelEx(true, GS_TITLESCREEN);
 		if (!titlemap)
 			return;
diff --git a/src/g_game.c b/src/g_game.c
index 680421693..cff9b0e2a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -5811,9 +5811,6 @@ void G_InitNew(UINT8 pencoremode, INT32 map, boolean resetplayer, boolean skippr
 
 	gamemap = map;
 
-	maptol = mapheaderinfo[gamemap-1]->typeoflevel;
-	globalweather = mapheaderinfo[gamemap-1]->weather;
-
 	// Don't carry over custom music change to another map.
 	mapmusflags |= MUSIC_RELOADRESET;
 
diff --git a/src/k_podium.c b/src/k_podium.c
index 9cf47d528..c8764dd8a 100644
--- a/src/k_podium.c
+++ b/src/k_podium.c
@@ -274,8 +274,7 @@ boolean K_StartCeremony(void)
 	{
 		gamemap = podiumMapNum+1;
 
-		maptol = mapheaderinfo[gamemap-1]->typeoflevel;
-		globalweather = mapheaderinfo[gamemap-1]->weather;
+		encoremode = grandprixinfo.encore;
 
 		if (savedata.lives > 0)
 		{