diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index 88156b64..6983010e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -1,7 +1,5 @@
 package it.integry.integrywmsnative.core.settings;
 
-import org.json.JSONObject;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -39,7 +37,7 @@ public class DBSettingsModel {
     private List<String> notePerditaDocInterni = new ArrayList<>();
     private boolean flagSpedizioneUseQtaOrd;
     private boolean flagOrdinaNuoviArticoliInGriglia;
-    private JSONObject docInterniCheckFornitore;
+    private String docInterniCheckFornitore;
     private String produzioneDefaultCodAnag;
     private String reportNameSpedizionChiudiOrdine;
     private int onNumCnfInputChanged = 1;
@@ -296,11 +294,11 @@ public class DBSettingsModel {
         return this;
     }
 
-    public JSONObject getDocInterniCheckFornitore() {
+    public String getDocInterniCheckFornitore() {
         return docInterniCheckFornitore;
     }
 
-    public DBSettingsModel setDocInterniCheckFornitore(JSONObject docInterniCheckFornitore) {
+    public DBSettingsModel setDocInterniCheckFornitore(String docInterniCheckFornitore) {
         this.docInterniCheckFornitore = docInterniCheckFornitore;
         return this;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index ade66c88..6d933ddd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -5,9 +5,6 @@ import android.content.Context;
 import com.annimon.stream.Stream;
 import com.google.firebase.perf.metrics.Trace;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -306,12 +303,8 @@ public class SettingsManager {
             dbSettingsModelIstance.setReportNameSpedizionChiudiOrdine(getValueFromList(list, "SPEDIZIONE", "REPORT_PACKING_LIST", String.class));
             dbSettingsModelIstance.setFlagSpedizioneUseQtaOrd(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_QTA_ORD", Boolean.class));
             dbSettingsModelIstance.setFlagOrdinaNuoviArticoliInGriglia(getValueFromList(list, "ORDINI_A", "ORDINA_NUOVI_ARTICOLI", Boolean.class));
-            String docTypeCheckFornitore = getValueFromList(list, "DOC_INTERNI", "CHECK_FORNITORE", String.class);
-            try {
-                dbSettingsModelIstance.setDocInterniCheckFornitore(new JSONObject(docTypeCheckFornitore));
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
+            dbSettingsModelIstance.setDocInterniCheckFornitore(getValueFromList(list, "DOC_INTERNI", "CHECK_FORNITORE", String.class));
+
             String notePerdita = getValueFromList(list, "DOC_INTERNI", "NOTE_PERDITA", String.class);
             if (notePerdita != null) {
                 dbSettingsModelIstance.setNotePerditaDocInterni(Arrays.asList(notePerdita.split("\\|")));
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
index e5ceb7f8..01cfd0d5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
@@ -133,6 +133,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
     }
 
     private void initViewModel(SqlMtbColt document, List<GrigliaAcquistiChildDTO> productList) {
+        this.viewModel.init();
         this.viewModel.setListeners(this);
         this.viewModel.setDocument(document);
         this.viewModel.setProductsList(productList);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index 66c9288c..99ea5659 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData;
 import com.annimon.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.math.BigDecimal;
@@ -47,10 +48,19 @@ public class DocInterniEditFormViewModel {
         this.docInterniRESTConsumer = docInterniRESTConsumer;
         this.mtbColrRepository = mtbColrRepository;
         this.mtbColtRepository = mtbColtRepository;
-        this.checkFornitoreRules = SettingsManager.iDB().getDocInterniCheckFornitore();
         this.docRows.setValue(new ArrayList<>());
     }
 
+    public void init() {
+        try {
+            var docInterniCheckFornitore = SettingsManager.iDB().getDocInterniCheckFornitore();
+            this.checkFornitoreRules = docInterniCheckFornitore != null ? new JSONObject(docInterniCheckFornitore) : null;
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+
     private void sendOnLoadingStarted() {
         if (this.listener != null) listener.onLoadingStarted();
     }