diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index b8463b994..17f8e495f 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1933,8 +1933,6 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 			D_QuitNetGame();
 			CL_Reset();
 			D_StartTitle();
-			memset(gamekeydown, 0, sizeof (gamekeydown));
-			memset(deviceResponding, false, sizeof (deviceResponding));
 			return false;
 		}
 
diff --git a/src/d_main.c b/src/d_main.c
index b24592d2d..d75f3202e 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1001,6 +1001,11 @@ void D_StartTitle(void)
 	G_SetGametype(GT_RACE); // SRB2kart
 	paused = false;
 	advancedemo = false;
+
+	// clear cmd building stuff
+	memset(gamekeydown, 0, sizeof (gamekeydown));
+	memset(deviceResponding, false, sizeof (deviceResponding));
+
 	F_StartTitleScreen();
 
 	// Reset the palette