diff --git a/src/snapshot.cpp b/src/snapshot.cpp
index 229c56a4f..df9155cef 100644
--- a/src/snapshot.cpp
+++ b/src/snapshot.cpp
@@ -438,7 +438,7 @@ unsigned long redisDbPersistentDataSnapshot::scan_threadsafe(unsigned long itera
         do
         {
             iterator = dictScan(m_pdict, iterator, snapshot_scan_callback, nullptr, pdata);
-        } while (iterator != 0 && iterator < iteratorReturn);
+        } while (iterator != 0 && (iterator < iteratorReturn || iteratorReturn == 0));
     }
     return iteratorReturn;
 }