diff --git a/src/db.c b/src/db.c
index f1a70dfe..f432d7cf 100644
--- a/src/db.c
+++ b/src/db.c
@@ -34,6 +34,7 @@
 
 void SlotToKeyAdd(robj *key);
 void SlotToKeyDel(robj *key);
+void SlotToKeyFlush(void);
 
 /*-----------------------------------------------------------------------------
  * C-level DB API
@@ -213,12 +214,14 @@ void flushdbCommand(redisClient *c) {
     signalFlushedDb(c->db->id);
     dictEmpty(c->db->dict);
     dictEmpty(c->db->expires);
+    if (server.cluster_enabled) SlotToKeyFlush();
     addReply(c,shared.ok);
 }
 
 void flushallCommand(redisClient *c) {
     signalFlushedDb(-1);
     server.dirty += emptyDb();
+    if (server.cluster_enabled) SlotToKeyFlush();
     addReply(c,shared.ok);
     if (server.rdb_child_pid != -1) {
         kill(server.rdb_child_pid,SIGUSR1);
@@ -755,6 +758,11 @@ void SlotToKeyDel(robj *key) {
     zslDelete(server.cluster->slots_to_keys,hashslot,key);
 }
 
+void SlotToKeyFlush(void) {
+    zslFree(server.cluster->slots_to_keys);
+    server.cluster->slots_to_keys = zslCreate();
+}
+
 unsigned int GetKeysInSlot(unsigned int hashslot, robj **keys, unsigned int count) {
     zskiplistNode *n;
     zrangespec range;