diff --git a/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt b/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
index 8ffcf14108..c5d9d91396 100644
--- a/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
+++ b/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
@@ -37,10 +37,10 @@ class CardTou {
         }
     }
 
-    private fun regionCode(cardId: String): String? = when (cardId.substring(2..3)) {
-        "0" -> "fr"
-        "1" -> "ch"
-        "2" -> "at"
+    private fun regionCode(cardId: String): String? = when (cardId[1]) {
+        '0' -> "fr"
+        '1' -> "ch"
+        '2' -> "at"
         else -> null
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt
index e9beba0bc0..b5793affa8 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.features.send.redux.middlewares
 
-import androidx.core.text.isDigitsOnly
 import com.tangem.blockchain.common.Wallet
 import com.tangem.commands.common.network.Result
 import com.tangem.tap.common.redux.AppState
@@ -129,8 +128,8 @@ internal class AddressPayIdMiddleware {
 
         val failReason = isValidBlockchainAddressAndNotTheSameAsWallet(wallet, supposedAddress)
         if (failReason == null) {
-            noSchemeAddress.getQueryParameter("amount")?.let {
-                if (it.isDigitsOnly()) dispatch(AmountAction.SetAmount(it.toBigDecimal(), false))
+            noSchemeAddress.getQueryParameter("amount")?.toBigDecimalOrNull()?.let {
+                dispatch(AmountAction.SetAmount(it, false))
             }
             dispatch(SetWalletAddress(supposedAddress, isUserInput))
             dispatch(TransactionExtrasAction.Prepare(wallet.blockchain, address, null))