diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/amount/SendAmountSubtractConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/amount/SendAmountSubtractConverter.kt
index bf0f52dd73..fb5d2708ad 100644
--- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/amount/SendAmountSubtractConverter.kt
+++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/amount/SendAmountSubtractConverter.kt
@@ -19,11 +19,13 @@ internal class SendAmountSubtractConverter(
         val feeValue = feeState.fee?.amount?.value ?: return state
         val amountTextField = amountState.amountTextField
         val amountValue = amountTextField.cryptoAmount.value ?: return state
+        val balance = cryptoCurrencyStatus.value.amount ?: return state
         val fiatRate = cryptoCurrencyStatus.value.fiatRate
         val cryptoDecimals = amountTextField.cryptoAmount.decimals
         val fiatDecimals = amountTextField.fiatAmount.decimals
 
-        val feeDiff = amountState.subtractedFee?.let { feeValue.minus(it) } ?: feeValue
+        val feeDiff = amountState.subtractedFee?.let { feeValue.minus(it) }
+            ?: amountValue.minus(balance.minus(feeValue))
         val decimalCryptoValue = amountValue.minus(feeDiff)
 
         if (decimalCryptoValue < BigDecimal.ZERO) return state
diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/confirm/SendNotificationFactory.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/confirm/SendNotificationFactory.kt
index 0d147eb6fd..4abd80f5cd 100644
--- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/confirm/SendNotificationFactory.kt
+++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/confirm/SendNotificationFactory.kt
@@ -247,7 +247,7 @@ internal class SendNotificationFactory(
             val totalAmount = feeAmount + receivedAmount
             val change = balance - totalAmount
             val isChangeLowerThanDust = change < dustValue && change != BigDecimal.ZERO
-            val isShowWarning = totalAmount < dustValue || isChangeLowerThanDust
+            val isShowWarning = receivedAmount < dustValue || isChangeLowerThanDust
             if (isShowWarning) {
                 add(
                     SendNotification.Error.MinimumAmountError(dustValue.toPlainString()),