diff --git a/engine/client/cl_demo.c b/engine/client/cl_demo.c
index 99f00d32e..370fe8b79 100644
--- a/engine/client/cl_demo.c
+++ b/engine/client/cl_demo.c
@@ -327,10 +327,6 @@ void CL_WriteDemoMessage( qboolean startup, int start, sizebuf_t *msg )
 
 	if( !file ) return;
 
-	// past the start but not recording a demo.
-	if( !startup && !cls.demorecording )
-		return;
-
 	swlen = MSG_GetNumBytesWritten( msg ) - start;
 	if( swlen <= 0 ) return;
 
diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 05b12e063..1ce5bbd4d 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -2347,14 +2347,11 @@ static void CL_ParseNetMessage( sizebuf_t *msg, void (*parsefn)( sizebuf_t * ))
 	// after we have parsed the frame
 	if( !cls.demoplayback )
 	{
+		if( cls.state != ca_active )
+			CL_WriteDemoMessage( true, cls.starting_count, msg );
+
 		if( cls.demorecording && !cls.demowaiting )
-		{
 			CL_WriteDemoMessage( false, cls.starting_count, msg );
-		}
-		else if( cls.state != ca_active )
-		{
-			CL_WriteDemoMessage( true, cls.starting_count, msg );
-		}
 	}
 }