diff --git a/src/db.cpp b/src/db.cpp
index 42a2f6d5d..552b3b505 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -674,6 +674,7 @@ bool redisDbPersistentData::iterate_threadsafe(std::function<bool(const char*, r
     dictIterator *di = dictGetIterator(m_pdict);
     dictEntry *de = nullptr;
     bool fResult = true;
+    serverAssert(m_pdict->iterators > 0);
 
     while((de = dictNext(di)) != nullptr)
     {
@@ -789,7 +790,7 @@ void keysCommand(client *c) {
 
     const redisDbPersistentData *snapshot = nullptr;
     if (!(c->flags & (CLIENT_MULTI | CLIENT_BLOCKED)))
-        snapshot = c->db->createSnapshot(c->mvccCheckpoint);
+        snapshot = c->db->createSnapshot(c->mvccCheckpoint, true /* fOptional */);
     if (snapshot != nullptr)
     {
         sds patternCopy = sdsdup(pattern);
@@ -2176,11 +2177,22 @@ void redisDbPersistentData::processChanges()
     m_setchanged.clear();
 }
 
-const redisDbPersistentData *redisDbPersistentData::createSnapshot(uint64_t mvccCheckpoint)
+const redisDbPersistentData *redisDbPersistentData::createSnapshot(uint64_t mvccCheckpoint, bool fOptional)
 {
     serverAssert(GlobalLocksAcquired());
     serverAssert(m_refCount == 0);  // do not call this on a snapshot
 
+    // First see if we have too many levels and can bail out of this to reduce load
+    int levels = 1;
+    redisDbPersistentData *psnapshot = m_spdbSnapshotHOLDER.get();
+    while (psnapshot != nullptr)
+    {
+        ++levels;
+        psnapshot = psnapshot->m_spdbSnapshotHOLDER.get();
+    }
+    if (fOptional && (levels > 8))
+        return nullptr;
+
     if (m_spdbSnapshotHOLDER != nullptr)
     {
         if (mvccCheckpoint <= m_spdbSnapshotHOLDER->mvccCheckpoint)
@@ -2188,15 +2200,17 @@ const redisDbPersistentData *redisDbPersistentData::createSnapshot(uint64_t mvcc
             m_spdbSnapshotHOLDER->m_refCount++;
             return m_spdbSnapshotHOLDER.get();
         }
-        serverLog(LL_WARNING, "Nested snapshot created");
+        serverLog(levels > 5 ? LL_NOTICE : LL_VERBOSE, "Nested snapshot created: %d levels", levels);
     }
     auto spdb = std::unique_ptr<redisDbPersistentData>(new (MALLOC_LOCAL) redisDbPersistentData());
     
     spdb->m_fAllChanged = false;
     spdb->m_fTrackingChanges = 0;
     spdb->m_pdict = m_pdict;
-    spdb->m_pdict->iterators++;
     spdb->m_pdictTombstone = m_pdictTombstone;
+    // Add a fake iterator so the dicts don't rehash (they need to be read only)
+    spdb->m_pdict->iterators++;
+    dictForceRehash(spdb->m_pdictTombstone);    // prevent rehashing by finishing the rehash now
     spdb->m_spdbSnapshotHOLDER = std::move(m_spdbSnapshotHOLDER);
     spdb->m_pdbSnapshot = m_pdbSnapshot;
     spdb->m_refCount = 1;
@@ -2264,7 +2278,9 @@ void redisDbPersistentData::endSnapshot(const redisDbPersistentData *psnapshot)
 
     serverAssert(m_spdbSnapshotHOLDER->m_pdict->iterators == 1);  // All iterators should have been free'd except the fake one from createSnapshot
     if (m_refCount == 0)
+    {
         m_spdbSnapshotHOLDER->m_pdict->iterators--;
+    }
 
     if (m_pdbSnapshot == nullptr)
     {
@@ -2336,7 +2352,9 @@ void redisDbPersistentData::endSnapshot(const redisDbPersistentData *psnapshot)
 
     // Fixup the about to free'd snapshots iterator count so the dtor doesn't complain
     if (m_refCount)
+    {
         m_spdbSnapshotHOLDER->m_pdict->iterators--;
+    }
 
     m_spdbSnapshotHOLDER = std::move(m_spdbSnapshotHOLDER->m_spdbSnapshotHOLDER);
     serverAssert(m_spdbSnapshotHOLDER != nullptr || m_pdbSnapshot == nullptr);
@@ -2350,6 +2368,7 @@ redisDbPersistentData::~redisDbPersistentData()
     serverAssert(m_pdbSnapshot == nullptr);
     serverAssert(m_refCount == 0);
     serverAssert(m_pdict->iterators == 0);
+    serverAssert(m_pdictTombstone == nullptr || m_pdictTombstone->iterators == 0);
     dictRelease(m_pdict);
     if (m_pdictTombstone)
         dictRelease(m_pdictTombstone);
diff --git a/src/dict.cpp b/src/dict.cpp
index 2cfc25334..2def6ac5d 100644
--- a/src/dict.cpp
+++ b/src/dict.cpp
@@ -1132,6 +1132,11 @@ void dictGetStats(char *buf, size_t bufsize, dict *d) {
     if (orig_bufsize) orig_buf[orig_bufsize-1] = '\0';
 }
 
+void dictForceRehash(dict *d)
+{
+    while (dictIsRehashing(d)) _dictRehashStep(d);
+}
+
 /* ------------------------------- Benchmark ---------------------------------*/
 
 #ifdef DICT_BENCHMARK_MAIN
diff --git a/src/dict.h b/src/dict.h
index 03c39c7ff..bc04381b8 100644
--- a/src/dict.h
+++ b/src/dict.h
@@ -189,6 +189,7 @@ uint8_t *dictGetHashFunctionSeed(void);
 unsigned long dictScan(dict *d, unsigned long v, dictScanFunction *fn, dictScanBucketFunction *bucketfn, void *privdata);
 uint64_t dictGetHash(dict *d, const void *key);
 dictEntry **dictFindEntryRefByPtrAndHash(dict *d, const void *oldptr, uint64_t hash);
+void dictForceRehash(dict *d);
 
 /* Hash table types */
 extern dictType dictTypeHeapStringCopyKey;
diff --git a/src/rdb.cpp b/src/rdb.cpp
index f8ee52874..c4d728aca 100644
--- a/src/rdb.cpp
+++ b/src/rdb.cpp
@@ -1403,7 +1403,7 @@ int launchRdbSaveThread(pthread_t &child, rdbSaveInfo *rsi)
     args->rsi.master_repl_offset = g_pserver->master_repl_offset;
         
     for (int idb = 0; idb < cserver.dbnum; ++idb)
-        args->rgpdb[idb] = g_pserver->db[idb].createSnapshot(getMvccTstamp());
+        args->rgpdb[idb] = g_pserver->db[idb].createSnapshot(getMvccTstamp(), false /* fOptional */);
 
     g_pserver->rdbThreadVars.tmpfileNum++;
     g_pserver->rdbThreadVars.fRdbThreadCancel = false;
@@ -2592,7 +2592,7 @@ int rdbSaveToSlavesSockets(rdbSaveInfo *rsi) {
     start = ustime();
 
     for (int idb = 0; idb < cserver.dbnum; ++idb)
-        args->rgpdb[idb] = g_pserver->db[idb].createSnapshot(getMvccTstamp());
+        args->rgpdb[idb] = g_pserver->db[idb].createSnapshot(getMvccTstamp(), false /*fOptional*/);
 
     g_pserver->rdbThreadVars.tmpfileNum++;
     g_pserver->rdbThreadVars.fRdbThreadCancel = false;
diff --git a/src/server.h b/src/server.h
index 46348969e..7e42eac42 100644
--- a/src/server.h
+++ b/src/server.h
@@ -1278,7 +1278,7 @@ public:
     expireset *setexpireUnsafe() { return m_setexpire; }
     const expireset *setexpire() { return m_setexpire; }
 
-    const redisDbPersistentData *createSnapshot(uint64_t mvccCheckpoint);
+    const redisDbPersistentData *createSnapshot(uint64_t mvccCheckpoint, bool fOptional);
     void endSnapshot(const redisDbPersistentData *psnapshot);
 
 private: