diff --git a/key-bindings.c b/key-bindings.c
index 39083af0..badbc0f4 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -138,12 +138,17 @@ void
 key_bindings_remove_table(const char *name)
 {
 	struct key_table	*table;
+	struct client		*c;
 
 	table = key_bindings_get_table(name, 0);
 	if (table != NULL) {
 		RB_REMOVE(key_tables, &key_tables, table);
 		key_bindings_unref_table(table);
 	}
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->keytable == table)
+			server_client_set_key_table(c, NULL);
+	}
 }
 
 void