diff --git a/src/main/java/org/apache/sling/event/impl/job/JobBlockingQueue.java b/src/main/java/org/apache/sling/event/impl/job/JobBlockingQueue.java
index d0dafe4..54b2b31 100644
--- a/src/main/java/org/apache/sling/event/impl/job/JobBlockingQueue.java
+++ b/src/main/java/org/apache/sling/event/impl/job/JobBlockingQueue.java
@@ -136,7 +136,7 @@
      * Check if this queue is marked for cleanup
      */
     public boolean isMarkedForCleanUp() {
-        return !this.isWaiting && this.markForCleanUp;
+        return !this.isWaiting && this.markForCleanUp && this.jobCount == 0;
     }
 
     /**