diff --git a/ems-engine/src/main/java/it/integry/ems/logistic/missioni/magazzino_automatico/service/MissioniMagazzinoAutomaticoService.java b/ems-engine/src/main/java/it/integry/ems/logistic/missioni/magazzino_automatico/service/MissioniMagazzinoAutomaticoService.java
index 1d7a52a0e4..0bcfea1c3a 100644
--- a/ems-engine/src/main/java/it/integry/ems/logistic/missioni/magazzino_automatico/service/MissioniMagazzinoAutomaticoService.java
+++ b/ems-engine/src/main/java/it/integry/ems/logistic/missioni/magazzino_automatico/service/MissioniMagazzinoAutomaticoService.java
@@ -4,7 +4,6 @@ import it.integry.ems.exception.PrimaryDatabaseNotPresentException;
 import it.integry.ems.logistic.missioni.magazzino_automatico.dto.MissioneMagazzinoAutomaticoDTO;
 import it.integry.ems.logistic.missioni.magazzino_automatico.dto.UpdateDestinazioneMissioniRequestDTO;
 import it.integry.ems.logistic.missioni.magazzino_automatico.utils.MissioniMagazzinoAutomaticoUtils;
-import it.integry.ems.production.dto.UpdateDestinazioneOrdineRequestDTO;
 import it.integry.ems.retail.wms.Utility.WMSUtility;
 import it.integry.ems.retail.wms.generic.dto.SpostaUlRequestDTO;
 import it.integry.ems.retail.wms.generic.service.WMSGenericService;
@@ -52,7 +51,7 @@ public class MissioniMagazzinoAutomaticoService {
 
         if (onlyPending) {
             whereCondOnlyPendingBuilder.append("mmma_det.completed = 0 AND mmma_det.skipped = 0 AND (\n" +
-                    "mmma_det.ended_at IS NULL\n" +
+                    "mmma_det.ended_at IS NULL OR mmma_det.error_message IS NOT NULL\n" +
                     ")");
         }
 
@@ -207,6 +206,7 @@ public class MissioniMagazzinoAutomaticoService {
             case "completed":
                 missioneRow.setCompleted(true);
                 missioneRow.setEndedAt(LocalDateTime.now());
+                missioneRow.setErrorMessage(EmsRestConstants.NULL);
                 break;
         }