diff --git a/lnbits/extensions/watchonly/static/components/payment/payment.js b/lnbits/extensions/watchonly/static/components/payment/payment.js
index 6b1f02d3..1459083c 100644
--- a/lnbits/extensions/watchonly/static/components/payment/payment.js
+++ b/lnbits/extensions/watchonly/static/components/payment/payment.js
@@ -68,7 +68,7 @@ async function payment(path) {
         return (
           this.selectedAmount -
           this.totalPayedAmount -
-          this.feeRate * this.txSizeNoChange
+          this.feeRate * this.txSize
         )
       },
       balance: function () {
@@ -184,7 +184,8 @@ async function payment(path) {
 
         if (!excludeChange) {
           const change = this.createChangeOutput()
-          if (this.changeAmount >= this.DUST_LIMIT) {
+          const diffAmount = this.selectedAmount - this.totalPayedAmount
+          if (diffAmount >= this.DUST_LIMIT) {
             tx.outputs.push(change)
           }
         }