diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
index 39f78cb1..42609532 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
@@ -492,18 +492,39 @@ public class DialogInputQuantityV2ViewModel {
                 return;
             }
 
-            if (!disableTracciabilitaCheck && mtbAart.get().isFlagTracciabilitaBoolean() && UtilityString.isNullOrEmpty(internalPartitaMag)) {
-                if (suggestPartitaMagRunnable != null) {
-                    internalPartitaMag = suggestPartitaMagRunnable.run(this);
-                    if (internalPartitaMag == null) {
+            if (!disableTracciabilitaCheck && mtbAart.get().isFlagTracciabilitaBoolean()) {
+                if (UtilityString.isNullOrEmpty(internalPartitaMag)) {
+                    if (suggestPartitaMagRunnable != null) {
+                        internalPartitaMag = suggestPartitaMagRunnable.run(this);
+                        if (internalPartitaMag == null) {
+                            this.sendError(new InvalidBatchLotException());
+                            onValidated.run(false);
+                            return;
+                        }
+                    } else {
                         this.sendError(new InvalidBatchLotException());
                         onValidated.run(false);
                         return;
                     }
                 } else {
-                    this.sendError(new InvalidBatchLotException());
-                    onValidated.run(false);
-                    return;
+                    if (SettingsManager.iDB().isFlagWarningNewPartitaMag()) {
+                        MtbPartitaMag mtbPartitaMag = null;
+                        try {
+                            mtbPartitaMag = retrievePartitaMag(internalPartitaMag, this.getMtbAart().getCodMart());
+                        } catch (Exception e) {
+                            this.sendError(e);
+                            onValidated.run(false);
+                            return;
+                        }
+
+                        if (mtbPartitaMag == null) {
+                            boolean result = runWarningDialogSyncronized(UtilityResources.getString(R.string.batch_lot_inexistent_error_message));
+                            if (!result) {
+                                onValidated.run(false);
+                                return;
+                            }
+                        }
+                    }
                 }
             }
 
@@ -577,25 +598,6 @@ public class DialogInputQuantityV2ViewModel {
             if (!UtilityString.isNullOrEmpty(this.internalPartitaMag))
                 this.internalPartitaMag = this.internalPartitaMag.toUpperCase();
 
-            if (SettingsManager.iDB().isFlagWarningNewPartitaMag()) {
-                MtbPartitaMag mtbPartitaMag = null;
-                try {
-                    mtbPartitaMag = retrievePartitaMag(internalPartitaMag, this.getMtbAart().getCodMart());
-                } catch (Exception e) {
-                    this.sendError(e);
-                    onValidated.run(false);
-                    return;
-                }
-
-                if (mtbPartitaMag == null) {
-                    boolean result = runWarningDialogSyncronized(UtilityResources.getString(R.string.batch_lot_inexistent_error_message));
-                    if (!result) {
-                        onValidated.run(false);
-                        return;
-                    }
-                }
-            }
-
             if (this.warnOnQuantityOverflow && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd) &&
                     this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {