diff --git a/src/kvstore.c b/src/kvstore.c
index 9e3061ba8..61f7e43ac 100644
--- a/src/kvstore.c
+++ b/src/kvstore.c
@@ -277,6 +277,7 @@ void kvstoreEmpty(kvstore *kvs, void(callback)(dict*)) {
         if (metadata->rehashing_node)
             metadata->rehashing_node = NULL;
         dictEmpty(d, callback);
+        freeDictIfNeeded(kvs, didx);
     }
 
     listEmpty(kvs->rehashing);