diff --git a/src/db.cpp b/src/db.cpp
index 68e1fae11..45bc16f02 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -1120,12 +1120,12 @@ int dbSwapDatabases(int id1, int id2) {
      * remain in the same DB they were. */
     db1->pdict = db2->pdict;
     db1->setexpire = db2->setexpire;
-    db1->expireitr = db2->expireitr->end();
+    db1->expireitr = db2->expireitr;
     db1->avg_ttl = db2->avg_ttl;
 
     db2->pdict = aux.pdict;
     db2->setexpire = aux.setexpire;
-    db2->expireitr = aux.expireitr->end();
+    db2->expireitr = aux.expireitr;
     db2->avg_ttl = aux.avg_ttl;
 
     /* Now we need to handle clients blocked on lists: as an effect