diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
index e8e0f60c9..bdf66ced6 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
@@ -576,12 +576,14 @@ public class FileStatusService {
 
         boolean reanalyse = fileModel.isReanalysisRequired() || manualRedactionReanalyse;
 
-        if (!reanalyse && !fileManagementStorageService.objectExists(dossierId, fileId, FileType.FIGURE) && settings.isCvServiceEnabled()) {
+        if (!reanalyse && !fileManagementStorageService.objectExists(dossierId, fileId, FileType.FIGURE) && settings.isFigureDetectionEnabled()) {
+            log.debug("Add file: {} from dossier {} to Figure Detection queue", fileId, dossierId);
             addToFigureDetectionRequestQueue(dossierId, fileId);
             return;
         }
 
         if (!reanalyse && !fileManagementStorageService.objectExists(dossierId, fileId, FileType.TABLES) && settings.isCvServiceEnabled()) {
+            log.debug("Add file: {} from dossier {} to Cv Service queue", fileId, dossierId);
             addToTableParsingRequestQueue(dossierId, fileId);
             return;
         }
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java
index c5f19c07a..9e1c0b8f1 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java
@@ -32,4 +32,6 @@ public class FileManagementServiceSettings {
 
     private boolean cvServiceEnabled;
 
+    private boolean figureDetectionEnabled;
+
 }