diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java
index c6b311d1..bc48235c 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java
@@ -180,6 +180,7 @@ public class PaymentController extends WalletFormController implements Initializ
             if(newValue != null) {
                 sendController.setPayNymPayment();
             }
+            revalidateAmount();
         });
 
         address.textProperty().addListener((observable, oldValue, newValue) -> {
@@ -320,6 +321,10 @@ public class PaymentController extends WalletFormController implements Initializ
     }
 
     private long getRecipientDustThreshold() {
+        if(payNymProperty.get() != null) {
+            return 0;
+        }
+
         Address address;
         try {
             address = getRecipientAddress();