diff --git a/src/defrag.c b/src/defrag.c
index 1a1ca1bf7..ed11eb590 100644
--- a/src/defrag.c
+++ b/src/defrag.c
@@ -1040,7 +1040,7 @@ void activeDefragCycle(void) {
                 server.stat_active_defrag_hits - prev_defragged > 512 ||
                 server.stat_active_defrag_scanned - prev_scanned > 64)
             {
-                if (!cursor || ustime() > endtime) {
+                if (!(cursor || expires_cursor) || ustime() > endtime) {
                     quit = 1;
                     break;
                 }