diff --git a/src/m_menu.c b/src/m_menu.c
index 949b6710d..acda718d3 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -6541,6 +6541,8 @@ INT32 MR_StartGrandPrix(INT32 choice)
 	roundqueue.position = roundqueue.roundnum = 1;
 	roundqueue.netcommunicate = true; // relevant for future Online GP
 
+	multiplayer = true;
+
 	D_MapChange(
 		roundqueue.entries[0].mapnum + 1,
 		roundqueue.entries[0].gametype,
diff --git a/src/p_setup.c b/src/p_setup.c
index 283a68814..da5a04c1d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -8628,7 +8628,7 @@ static void P_InitGametype(void)
 
 	// Start recording replay in multiplayer with a temp filename
 	//@TODO I'd like to fix dedis crashing when recording replays for the future too...
-	if (!demo.playback && (multiplayer || grandprixinfo.gp) && !dedicated)
+	if (!demo.playback && multiplayer && !dedicated)
 	{
 		char buf[MAX_WADPATH];
 		char ver[128];