diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
index 2a30def6..d42fe92a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
@@ -207,7 +207,10 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
                             .filter(x -> {
                                 String codMart = x.getMtbColr().getMtbAart().getCodMart().toLowerCase();
                                 String descrizioneArt = x.getMtbColr().getMtbAart().getDescrizioneEstesa().toLowerCase();
-                                String diacod = x.getMtbColr().getMtbAart().getDiacod().toLowerCase();
+                                String diacod = x.getMtbColr().getMtbAart().getDiacod();
+                                if (!UtilityString.isNullOrEmpty(diacod)) {
+                                    diacod = diacod.toLowerCase();
+                                }
 
                                 return ((codMart.startsWith(finalNewText) ||
                                         codMart.endsWith(finalNewText) ||
@@ -217,10 +220,10 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
                                                 descrizioneArt.endsWith(finalNewText) ||
                                                 descrizioneArt.contains(finalNewText) ||
                                                 descrizioneArt.equalsIgnoreCase(finalNewText)) ||
-                                        (diacod.startsWith(finalNewText) ||
+                                        (!UtilityString.isNullOrEmpty(diacod) && (diacod.startsWith(finalNewText) ||
                                                 diacod.endsWith(finalNewText) ||
                                                 diacod.contains(finalNewText) ||
-                                                diacod.equalsIgnoreCase(finalNewText))) &&
+                                                diacod.equalsIgnoreCase(finalNewText)))) &&
                                         !x.isHidden();
                             })
                             .toList();