diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c
index f03cb2053..eb7e52aea 100644
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@@ -125,11 +125,10 @@ CL_StopPlayback (void)
 
 	Qclose (cls.demofile);
 	cls.demofile = NULL;
+	key_game_target = IMT_0;
 	CL_SetState (ca_disconnected);
 	cls.demo_capture = 0;
 	cls.demoplayback = 0;
-	key_game_target = IMT_0;
-	Key_SetKeyDest (key_game);
 
 	if (cls.timedemo)
 		CL_FinishTimeDemo ();
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index 7ae89ab05..ccdede04a 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -144,14 +144,13 @@ CL_StopPlayback (void)
 
 	Qclose (cls.demofile);
 	cls.demofile = NULL;
+	key_game_target = IMT_0;
 	CL_SetState (ca_disconnected);
 	cls.demo_capture = 0;
 	cls.demoplayback = 0;
 	cls.demoplayback2 = 0;
 	demotime_cached = 0;
 	net_blocksend = 0;
-	key_game_target = IMT_0;
-	Key_SetKeyDest (key_game);
 
 	if (cls.timedemo)
 		CL_FinishTimeDemo ();