diff --git a/code/client/cl_parse.c b/code/client/cl_parse.c
index 763486be..35b6605a 100644
--- a/code/client/cl_parse.c
+++ b/code/client/cl_parse.c
@@ -505,11 +505,8 @@ void CL_ParseGamestate( msg_t *msg ) {
 	CL_SystemInfoChanged();
 
 	// stop recording now so the demo won't have an unnecessary level load at the end.
-	if(clc.demorecording)
+	if(cl_autoRecordDemo->integer && clc.demorecording)
 		CL_StopRecord_f();
-	// same fore AVI recording
-	if(CL_VideoRecording())
-		CL_CloseAVI();
 	
 	// reinitialize the filesystem if the game directory has changed
 	FS_ConditionalRestart( clc.checksumFeed );
diff --git a/code/client/client.h b/code/client/client.h
index 35d8251a..17b6d218 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -370,6 +370,7 @@ extern	cvar_t	*cl_conXOffset;
 extern	cvar_t	*cl_inGameVideo;
 
 extern	cvar_t	*cl_lanForcePackets;
+extern	cvar_t	*cl_autoRecordDemo;
 
 //=================================================