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 e17313e475..3ad03b434c 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
@@ -24,7 +24,6 @@ import com.tangem.features.send.impl.presentation.state.fee.checkIfFeeTooHigh
 import com.tangem.features.send.impl.presentation.viewmodel.SendClickIntents
 import com.tangem.lib.crypto.BlockchainUtils.isDogecoin
 import com.tangem.utils.Provider
-import com.tangem.utils.isNullOrZero
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
@@ -108,23 +107,6 @@ internal class SendNotificationFactory(
         }
     }
 
-    private fun MutableList<SendNotification>.addMinimumAmountErrorNotification(
-        feeAmount: BigDecimal,
-        receivedAmount: BigDecimal,
-    ) {
-        val coinCryptoCurrencyStatus = coinCryptoCurrencyStatusProvider()
-
-        val totalAmount = feeAmount + receivedAmount
-        val balance = coinCryptoCurrencyStatus.value.amount ?: BigDecimal.ZERO
-
-        if (isDogecoin(coinCryptoCurrencyStatus.currency.network.id.value)) {
-            val minimum = BigDecimal(DOGECOIN_MINIMUM)
-            if (receivedAmount < minimum || balance - totalAmount < minimum) {
-                add(SendNotification.Error.MinimumAmountError(DOGECOIN_MINIMUM))
-            }
-        }
-    }
-
     // todo temporarily disabling notification
     // private suspend fun MutableList<SendNotification>.addReserveAmountErrorNotification(recipientAddress: String) {
     //     val userWalletId = userWalletProvider().walletId
@@ -236,6 +218,20 @@ internal class SendNotificationFactory(
         }
     }
 
+    private fun MutableList<SendNotification>.addMinimumAmountErrorNotification(
+        feeAmount: BigDecimal,
+        receivedAmount: BigDecimal,
+    ) {
+        val coinCryptoCurrencyStatus = coinCryptoCurrencyStatusProvider()
+        val minimum = BigDecimal(DOGECOIN_MINIMUM)
+
+        val isDogecoin = isDogecoin(coinCryptoCurrencyStatus.currency.network.id.value)
+        val isExceedDustLimit = checkDustLimits(feeAmount, receivedAmount, minimum)
+        if (isDogecoin && isExceedDustLimit) {
+            add(SendNotification.Error.MinimumAmountError(DOGECOIN_MINIMUM))
+        }
+    }
+
     private suspend fun MutableList<SendNotification>.addDustWarningNotification(
         feeAmount: BigDecimal,
         receivedAmount: BigDecimal,
@@ -244,18 +240,12 @@ internal class SendNotificationFactory(
         val dustValue = currencyChecksRepository.getDustValue(
             userWalletProvider().walletId,
             cryptoCurrencyStatus.currency.network,
-        )
-        val balance = cryptoCurrencyStatus.value.amount ?: BigDecimal.ZERO
-        if (dustValue != null && !balance.isNullOrZero() && receivedAmount < balance) {
-            val totalAmount = feeAmount + receivedAmount
-            val change = balance - totalAmount
-            val isChangeLowerThanDust = change < dustValue && change != BigDecimal.ZERO
-            val isShowWarning = receivedAmount < dustValue || isChangeLowerThanDust
-            if (isShowWarning) {
-                add(
-                    SendNotification.Error.MinimumAmountError(dustValue.toPlainString()),
-                )
-            }
+        ) ?: return
+
+        if (checkDustLimits(feeAmount, receivedAmount, dustValue)) {
+            add(
+                SendNotification.Error.MinimumAmountError(dustValue.toPlainString()),
+            )
         }
     }
 
@@ -360,6 +350,16 @@ internal class SendNotificationFactory(
         return Blockchain.fromNetworkId(this.currency.network.backendId) == Blockchain.Arbitrum
     }
 
+    private fun checkDustLimits(feeAmount: BigDecimal, receivedAmount: BigDecimal, dustValue: BigDecimal): Boolean {
+        val cryptoCurrencyStatus = cryptoCurrencyStatusProvider()
+        val balance = cryptoCurrencyStatus.value.amount ?: BigDecimal.ZERO
+
+        val totalAmount = feeAmount + receivedAmount
+        val change = balance - totalAmount
+        val isChangeLowerThanDust = change < dustValue && change > BigDecimal.ZERO
+        return receivedAmount < dustValue || isChangeLowerThanDust
+    }
+
     companion object {
         private const val DOGECOIN_MINIMUM = "0.01"
     }