diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c
index 2a0e1aa7..c18f9ad0 100644
--- a/cmd-command-prompt.c
+++ b/cmd-command-prompt.c
@@ -185,10 +185,7 @@ cmd_command_prompt_callback(void *data, const char *s)
 	}
 
 	ctx = cmd_get_ctx();
-	ctx->msgdata = NULL;
 	ctx->curclient = c;
-	ctx->cmdclient = NULL;
-
 	ctx->error = key_bindings_error;
 	ctx->print = key_bindings_print;
 	ctx->info = key_bindings_info;
diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c
index 33733c33..067b5e7a 100644
--- a/cmd-confirm-before.c
+++ b/cmd-confirm-before.c
@@ -126,10 +126,7 @@ cmd_confirm_before_callback(void *data, const char *s)
 	}
 
 	ctx = cmd_get_ctx();
-	ctx->msgdata = NULL;
 	ctx->curclient = c;
-	ctx->cmdclient = NULL;
-
 	ctx->error = key_bindings_error;
 	ctx->print = key_bindings_print;
 	ctx->info = key_bindings_info;
diff --git a/control.c b/control.c
index f00f57f9..8e3c4e87 100644
--- a/control.c
+++ b/control.c
@@ -109,10 +109,7 @@ control_callback(struct client *c, int closed, unused void *data)
 		}
 
 		ctx = cmd_get_ctx();
-		ctx->msgdata = NULL;
-		ctx->cmdclient = NULL;
 		ctx->curclient = c;
-
 		ctx->error = control_msg_error;
 		ctx->print = control_msg_print;
 		ctx->info = control_msg_info;
diff --git a/key-bindings.c b/key-bindings.c
index a25d3700..f510ba68 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -267,10 +267,7 @@ key_bindings_dispatch(struct key_binding *bd, struct client *c)
 	int		 readonly;
 
 	ctx = cmd_get_ctx();
-	ctx->msgdata = NULL;
-	ctx->cmdclient = NULL;
 	ctx->curclient = c;
-
 	ctx->error = key_bindings_error;
 	ctx->print = key_bindings_print;
 	ctx->info = key_bindings_info;
diff --git a/server-client.c b/server-client.c
index 1500419c..47a84bc0 100644
--- a/server-client.c
+++ b/server-client.c
@@ -871,9 +871,7 @@ server_client_msg_command(struct client *c, struct msg_command_data *data)
 
 	ctx = cmd_get_ctx();
 	ctx->msgdata = data;
-	ctx->curclient = NULL;
 	ctx->cmdclient = c;
-
 	ctx->error = server_client_msg_error;
 	ctx->print = server_client_msg_print;
 	ctx->info = server_client_msg_info;
diff --git a/window-choose.c b/window-choose.c
index e48db7e5..eb526ec4 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -221,10 +221,7 @@ window_choose_data_run(struct window_choose_data *cdata)
 	}
 
 	ctx = cmd_get_ctx();
-	ctx->msgdata = NULL;
 	ctx->curclient = cdata->start_client;
-	ctx->cmdclient = NULL;
-
 	ctx->error = key_bindings_error;
 	ctx->print = key_bindings_print;
 	ctx->info = key_bindings_info;