diff --git a/code/client/cl_parse.c b/code/client/cl_parse.c
index c422dec7..a424aa59 100644
--- a/code/client/cl_parse.c
+++ b/code/client/cl_parse.c
@@ -352,11 +352,6 @@ void CL_SystemInfoChanged( void ) {
 	// in some cases, outdated cp commands might get sent with this news serverId
 	cl.serverId = atoi( Info_ValueForKey( systemInfo, "sv_serverid" ) );
 
-	// don't set any vars when playing a demo
-	if ( clc.demoplaying ) {
-		return;
-	}
-
 #ifdef USE_VOIP
 #ifdef LEGACY_PROTOCOL
 	if(clc.compat)
@@ -369,6 +364,11 @@ void CL_SystemInfoChanged( void ) {
 	}
 #endif
 
+	// don't set any vars when playing a demo
+	if ( clc.demoplaying ) {
+		return;
+	}
+
 	s = Info_ValueForKey( systemInfo, "sv_cheats" );
 	cl_connectedToCheatServer = atoi( s );
 	if ( !cl_connectedToCheatServer ) {