diff --git a/src/p_setup.c b/src/p_setup.c
index 3b2392ffd..5981439db 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -8598,7 +8598,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 && !dedicated)
+	if (!demo.playback && (multiplayer || grandprixinfo.gp) && !dedicated)
 	{
 		char buf[MAX_WADPATH];
 		char ver[128];