diff --git a/lib/src/domain/exchange/xmrto/xmrto_exchange_provider.dart b/lib/src/domain/exchange/xmrto/xmrto_exchange_provider.dart
index 47f5716d8..ee58771d1 100644
--- a/lib/src/domain/exchange/xmrto/xmrto_exchange_provider.dart
+++ b/lib/src/domain/exchange/xmrto/xmrto_exchange_provider.dart
@@ -68,9 +68,9 @@ class XMRTOExchangeProvider extends ExchangeProvider {
 
     if (price > 0) {
       try {
-        min /= price;
-        min = limitsFormat(min) + correction;
-        max /= price;
+        min = min/price + correction;
+        min = limitsFormat(min);
+        max = max/price - correction;
         max = limitsFormat(max);
       } catch (e) {
         min = 0;
diff --git a/lib/src/stores/exchange/exchange_store.dart b/lib/src/stores/exchange/exchange_store.dart
index df8f9b618..a5f41444b 100644
--- a/lib/src/stores/exchange/exchange_store.dart
+++ b/lib/src/stores/exchange/exchange_store.dart
@@ -107,6 +107,7 @@ abstract class ExchangeStoreBase with Store {
 
     if (amount == null || amount.isEmpty) {
       depositAmount = '';
+      receiveAmount = '';
       return;
     }
 
@@ -125,6 +126,7 @@ abstract class ExchangeStoreBase with Store {
 
     if (amount == null || amount.isEmpty) {
       depositAmount = '';
+      receiveAmount = '';
       return;
     }