diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index b6ec739b..f6b39230 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -2973,12 +2973,12 @@ Host_ClientBegin
 */
 void Host_ClientBegin( void )
 {
-	// if client is not active, do nothing
-	if( !cls.initialized ) return;
-
 	// exec console commands
 	Cbuf_Execute ();
 
+	// if client is not active, do nothing
+	if( !cls.initialized ) return;
+
 	// finalize connection process if needs
 	CL_CheckClientState();
 
diff --git a/engine/client/input.c b/engine/client/input.c
index 79d94ee3..47a17109 100644
--- a/engine/client/input.c
+++ b/engine/client/input.c
@@ -669,8 +669,6 @@ void Host_InputFrame( void )
 		}
 	}
 
-	Cbuf_Execute ();
-
 	if( !in_mouseinitialized )
 		return;