diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/audit/AuditManager.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/audit/AuditManager.java
index 856bc281..ff7852ac 100644
--- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/audit/AuditManager.java
+++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/audit/AuditManager.java
@@ -16,6 +16,7 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
@@ -27,6 +28,7 @@
 
 @Slf4j
 @Component
+@ConditionalOnProperty("ms.validator.audit.enabled")
 public class AuditManager {
 
     @Autowired