diff --git a/src/debug.c b/src/debug.c
index 49f7ab2ac..d2d14cdba 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -182,6 +182,9 @@ void debugCommand(redisClient *c) {
             addReplyError(c, "DEBUG FLUSHCACHE called with diskstore off.");
             return;
         } else {
+            /* To flush the whole cache we need to wait for everything to
+             * be flushed on disk... */
+            cacheForcePointInTime();
             emptyDb();
             addReply(c,shared.ok);
             return;