diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java
index eeb92d83f..9cdb20c7d 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java
@@ -47,7 +47,7 @@ public class AutomaticAnalysisJob implements Job {
 
                 var queuedFiles = 0;
 
-                while (queuedFiles < (consumerCount * 5)) {
+                while (queuedFiles < (consumerCount * 5) && allStatusesIterator.hasNext()) {
                     var next = allStatusesIterator.next();
                     // in case the file doesn't have numberOfPages set, we assume an average.