diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java
index 403151ac7..770a6f02b 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java
@@ -55,7 +55,7 @@ public class ReanalysisRequiredStatusService {
                                                            Map<String, DossierEntity> dossierMap) {
 
         if (ProcessingStatus.ERROR.equals(fileStatus.getProcessingStatus())) {
-            return new AnalysisRequiredResult(true, true);
+            return new AnalysisRequiredResult(false, true);
         }
 
         if (ProcessingStatus.PROCESSED.equals(fileStatus.getProcessingStatus()) || ProcessingStatus.UNPROCESSED.equals(fileStatus.getProcessingStatus())) {
@@ -65,10 +65,10 @@ public class ReanalysisRequiredStatusService {
                 case UNDER_REVIEW:
                 case UNDER_APPROVAL:
                     if (fileStatus.getLastProcessed() == null) {
-                        return new AnalysisRequiredResult(true, true);
+                        return new AnalysisRequiredResult(false, true);
                     }
                     if (fileStatus.getLastFileAttributeChange() != null && fileStatus.getLastProcessed().isBefore(fileStatus.getLastFileAttributeChange())) {
-                        return new AnalysisRequiredResult(true, true);
+                        return new AnalysisRequiredResult(true, false);
                     } else {
                         return requiresReanalysisBasedOnVersionDifference(fileStatus, dossierTemplateVersionMap, dossierVersionMap, dossierMap);
                     }
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java
index ba7583977..6bd8260ed 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/scheduler/AutomaticAnalysisScheduler.java
@@ -64,13 +64,13 @@ public class AutomaticAnalysisScheduler {
                     var next = allStatusesIterator.next();
                     // in case the file doesn't have numberOfPages set, we assume an average.
                     worstCaseScenarioQueuedPages += next.getNumberOfPages() <= 0 ? pageFactor : next.getNumberOfPages();
-                    log.info("Queued file: {} for automatic analysis!", next.getFilename());
 
-                    if (next.isReanalysisRequired()) {
-                        fileStatusService.setStatusReprocess(next.getDossierId(), next.getId(), 1);
-                    }
-                    if (next.isAnalysisRequired()) {
+                    if (next.isFullAnalysisRequired()) {
+                        log.info("Queued file: {} for automatic full analysis! ", next.getFilename());
                         fileStatusService.setStatusFullReprocess(next.getDossierId(), next.getId(), 1);
+                    } else if(next.isReanalysisRequired()){
+                        log.info("Queued file: {} for automatic reanalysis! ", next.getFilename());
+                        fileStatusService.setStatusReprocess(next.getDossierId(), next.getId(), 1);
                     }
                 }
             }