diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index f61b5930..f39c0e31 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -98,7 +98,6 @@ cmd_attach_session(struct cmdq_item *item, int dflag, int rflag,
 			environ_update(s->options, c->environ, s->environ);
 
 		c->session = s;
-		server_client_set_key_table(c, NULL);
 		status_timer_start(c);
 		notify_client("client-session-changed", c);
 		session_update_activity(s, NULL);
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 10304bc0..a39522ac 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -277,7 +277,6 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
 		} else if (c->session != NULL)
 			c->last_session = c->session;
 		c->session = s;
-		server_client_set_key_table(c, NULL);
 		status_timer_start(c);
 		notify_client("client-session-changed", c);
 		session_update_activity(s, NULL);
diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index cd46db39..5cf4756f 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -108,7 +108,6 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
 	if (c->session != NULL && c->session != s)
 		c->last_session = c->session;
 	c->session = s;
-	server_client_set_key_table(c, NULL);
 	status_timer_start(c);
 	session_update_activity(s, NULL);
 	gettimeofday(&s->last_attached_time, NULL);