diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileAttributesManagementService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileAttributesManagementService.java
index 643347db1..cfe0ed5cb 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileAttributesManagementService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileAttributesManagementService.java
@@ -160,9 +160,9 @@ public class FileAttributesManagementService {
     }
 
 
+    @Transactional
     public void setFileAttributes(String dossierId, String fileId, Map<String, String> fileAttributesMap) {
 
-        fileStatusPersistenceService.updateProcessingStatus(fileId, ProcessingStatus.REPROCESS);
         fileStatusPersistenceService.setFileAttributes(dossierId, fileId, fileAttributesMap);
         fileStatusService.setStatusReprocess(dossierId, fileId, true);
         indexingService.addToIndexingQueue(IndexMessageType.UPDATE, null, dossierId, fileId, 2);
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReanalysisRequiredStatusService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReanalysisRequiredStatusService.java
index c5a75b918..88ac40e05 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReanalysisRequiredStatusService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReanalysisRequiredStatusService.java
@@ -121,7 +121,7 @@ public class ReanalysisRequiredStatusService {
         var rulesVersionMatches = fileStatus.getRulesVersion() == dossierTemplateVersions.getOrDefault(RULES, -1L);
         var dictionaryVersionMatches = fileStatus.getDictionaryVersion() == dossierTemplateVersions.getOrDefault(DICTIONARY, -1L);
         var legalBasisVersionMatches = fileStatus.getLegalBasisVersion() == dossierTemplateVersions.getOrDefault(LEGAL_BASIS, -1L);
-        var dossierDictionaryVersionMatches = fileStatus.getDossierDictionaryVersion() == dossierDictionaryVersion;
+        var dossierDictionaryVersionMatches = Math.max(fileStatus.getDossierDictionaryVersion(), 0) == dossierDictionaryVersion;
 
         var reanalysisRequired = !dictionaryVersionMatches || !dossierDictionaryVersionMatches;
         var fullAnalysisRequired = !rulesVersionMatches || !legalBasisVersionMatches;
@@ -135,7 +135,7 @@ public class ReanalysisRequiredStatusService {
                     dossierTemplateVersions.getOrDefault(DICTIONARY, -1L),
                     fileStatus.getLegalBasisVersion(),
                     dossierTemplateVersions.getOrDefault(LEGAL_BASIS, -1L),
-                    fileStatus.getDossierDictionaryVersion(),
+                    Math.max(fileStatus.getDossierDictionaryVersion(), 0),
                     dossierDictionaryVersion);
         }
         return new AnalysisRequiredResult(reanalysisRequired, fullAnalysisRequired);