===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-switch-client.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- src/usr.bin/tmux/cmd-switch-client.c	2015/12/12 18:28:47	1.36
+++ src/usr.bin/tmux/cmd-switch-client.c	2015/12/12 18:32:24	1.37
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-switch-client.c,v 1.36 2015/12/12 18:28:47 nicm Exp $ */
+/* $OpenBSD: cmd-switch-client.c,v 1.37 2015/12/12 18:32:24 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -124,6 +124,7 @@
 	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);