diff --git a/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v470/converters/AiProjConverter.java b/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v470/converters/AiProjConverter.java
index 453ba1e9..b9a90e8a 100644
--- a/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v470/converters/AiProjConverter.java
+++ b/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v470/converters/AiProjConverter.java
@@ -285,7 +285,10 @@ public static MailingProjectSettingsModel apply(
             ApiClient client) {
         if (null == settings.getMailingProjectSettings()) return model;
         UnifiedAiProjScanSettings.MailingProjectSettings mailingProjectSettings = settings.getMailingProjectSettings();
-        if (!mailingProjectSettings.getEnabled()) return model;
+        if (!mailingProjectSettings.getEnabled()) {
+            model.setEnabled(false);
+            return model;
+        }
 
         List<MailProfileModel> mailProfiles = call(
                 () -> client.getMailingApi().apiMailingMailProfilesGet(),
diff --git a/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v471/converters/AiProjConverter.java b/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v471/converters/AiProjConverter.java
index 9444b46f..49bfb852 100644
--- a/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v471/converters/AiProjConverter.java
+++ b/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v471/converters/AiProjConverter.java
@@ -318,7 +318,10 @@ public static MailingProjectSettingsModel apply(
         }
         if (null == settings.getMailingProjectSettings()) return model;
         UnifiedAiProjScanSettings.MailingProjectSettings mailingProjectSettings = settings.getMailingProjectSettings();
-        if (!mailingProjectSettings.getEnabled()) return model;
+        if (!mailingProjectSettings.getEnabled()) {
+            model.setEnabled(false);
+            return model;
+        }
 
         List<MailProfileModel> mailProfiles = call(
                 () -> client.getMailingApi().apiMailingMailProfilesGet(),
diff --git a/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v472/converters/AiProjConverter.java b/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v472/converters/AiProjConverter.java
index a05d9fbc..3aef150f 100644
--- a/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v472/converters/AiProjConverter.java
+++ b/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v472/converters/AiProjConverter.java
@@ -318,7 +318,10 @@ public static MailingProjectSettingsModel apply(
         }
         if (null == settings.getMailingProjectSettings()) return model;
         UnifiedAiProjScanSettings.MailingProjectSettings mailingProjectSettings = settings.getMailingProjectSettings();
-        if (!mailingProjectSettings.getEnabled()) return model;
+        if (!mailingProjectSettings.getEnabled()) {
+            model.setEnabled(false);
+            return model;
+        }
 
         List<MailProfileModel> mailProfiles = call(
                 () -> client.getMailingApi().apiMailingMailProfilesGet(),
diff --git a/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v480/converters/AiProjConverter.java b/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v480/converters/AiProjConverter.java
index 65e2cce4..f265e5a2 100644
--- a/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v480/converters/AiProjConverter.java
+++ b/generic-client-lib/src/main/java/com/ptsecurity/appsec/ai/ee/utils/ci/integration/api/v480/converters/AiProjConverter.java
@@ -318,7 +318,10 @@ public static MailingProjectSettingsModel apply(
         }
         if (null == settings.getMailingProjectSettings()) return model;
         UnifiedAiProjScanSettings.MailingProjectSettings mailingProjectSettings = settings.getMailingProjectSettings();
-        if (!mailingProjectSettings.getEnabled()) return model;
+        if (!mailingProjectSettings.getEnabled()) {
+            model.setEnabled(false);
+            return model;
+        }
 
         List<MailProfileModel> mailProfiles = call(
                 () -> client.getMailingApi().apiMailingMailProfilesGet(),