diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupModel.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupModel.kt
index d832e12eea..487e568445 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupModel.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupModel.kt
@@ -113,7 +113,7 @@ internal class TangemPayCardLimitSetupModel @Inject constructor(
     }
 
     private fun onAmountChange(newValue: String) {
-        if (newValue.toBigDecimalOrNull() == null) return
+        if (newValue.isNotEmpty() && newValue.toBigDecimalOrNull() == null) return
         uiState.update { state ->
             state.copy(
                 amountFieldModel = state.amountFieldModel.copy(value = newValue),
diff --git a/features/tangempay/details/impl/src/test/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupModelTest.kt b/features/tangempay/details/impl/src/test/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupModelTest.kt
index b99ecc5bb7..f9a1defa96 100644
--- a/features/tangempay/details/impl/src/test/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupModelTest.kt
+++ b/features/tangempay/details/impl/src/test/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupModelTest.kt
@@ -101,6 +101,7 @@ internal class TangemPayCardLimitSetupModelTest {
     ) {
         val model = createModel()
 
+        model.uiState.value.amountFieldModel.onValueChange("100")
         model.uiState.value.amountFieldModel.onValueChange(amount)
 
         assertThat(model.uiState.value.isSubmitButtonEnabled).isEqualTo(expectedEnabled)
@@ -149,7 +150,7 @@ internal class TangemPayCardLimitSetupModelTest {
         Arguments.of("100", true),
         Arguments.of("-1", false),
         Arguments.of("", false),
-        Arguments.of("abc", false),
+        Arguments.of("abc", true),
         Arguments.of("1001", false),
     )
 }
\ No newline at end of file