diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
index 0c71ad4b..164c4d32 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
@@ -945,11 +945,21 @@ public class PickingLiberoViewModel {
                     var closeUDSRequest = new CloseUDSRequestDTO()
                             .setMtbColt(mCurrentMtbColt);
 
-                    if (this.mDefaultGestione == GestioneEnum.LAVORAZIONE) {
+                    if (this.mDefaultGestione == GestioneEnum.LAVORAZIONE && SettingsManager.iDB().isProduzioneGeneraDocScar()) {
+
+                        if(SettingsManager.iDB().getInternalCodAnags() == null || SettingsManager.iDB().getInternalCodAnags().isEmpty()) {
+                            this.sendError(new Exception("Nessuna anagrafica aziendale configurata. Assicurarsi di aver abilitato il flag FLAG_USE_COD_ANAG_AZIENDALE."));
+                            return;
+                        }
+
                         closeUDSRequest
                                 .setCreateDocument(SettingsManager.iDB().isProduzioneGeneraDocScar())
                                 .setDocumentCodDtip(SettingsManager.iDB().getProduzioneCodDtipScar())
-                                .setDocumentCodAnag(SettingsManager.iDB().getInternalCodAnags().stream().filter(InternalCodAnagsDTO::isFornitore).findFirst().get().getCodAnag());
+                                .setDocumentCodAnag(SettingsManager.iDB().getInternalCodAnags().stream()
+                                        .filter(InternalCodAnagsDTO::isFornitore)
+                                        .findFirst()
+                                        .get()
+                                        .getCodAnag());
                     }
 
                     this.mColliScaricoRESTConsumer.closeUDS(closeUDSRequest, response -> {