diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskCliente.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskCliente.java
index 2bf9044e..90e693c3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskCliente.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskCliente.java
@@ -21,6 +21,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDialog;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogAskClienteBinding;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteDestinatarioDTO;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.DialogAskCliente_Page1ViewModel;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.DialogAskCliente_Page2ViewModel;
 
@@ -91,7 +92,9 @@ public class DialogAskCliente {
             });
 
             viewModel2.setOnConfirmClickListener(() -> {
-                onComplete.run(DialogConsts.Results.YES, viewModel2.getCurrentDestinatario().toVtbDestModel(), viewModel1.getCurrentCommessa());
+                DialogAskClienteDestinatarioDTO cliente = viewModel2.getCurrentDestinatario();
+
+                onComplete.run(DialogConsts.Results.YES, cliente != null ? cliente.toVtbDestModel() : null, viewModel1.getCurrentCommessa());
                 mDialog.dismiss();
             });
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java
index 7c86bf78..f5f6a7c5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java
@@ -24,6 +24,8 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
     private DialogAskClientePage2Binding mBinding;
     private Context mContext;
 
+    private Runnable mOnConfirm;
+
     private List<DialogAskClienteDestinatarioDTO> availableDestinatari;
 
     private String mCodAnag;
@@ -55,6 +57,11 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
             public void onSuccess(ArrayList<DialogAskClienteDestinatarioDTO> value) {
                 availableDestinatari = value;
                 initializeAdapter(value);
+
+                if(value == null || value.size() == 0) {
+                    mOnConfirm.run();
+                    return;
+                }
             }
 
             @Override
@@ -66,6 +73,7 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
 
     @Override
     public void setOnConfirmClickListener(Runnable onConfirm) {
+        this.mOnConfirm = onConfirm;
         this.mBinding.buttonYes.setOnClickListener(v -> {
             if (validateDestinatario()) {
                 this.resetClienteError();