diff --git a/src/js/controllers/modals/inputAmount.js b/src/js/controllers/modals/inputAmount.js
index 91acce98a..e0ed6057a 100644
--- a/src/js/controllers/modals/inputAmount.js
+++ b/src/js/controllers/modals/inputAmount.js
@@ -137,6 +137,7 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
     } catch (e) {
       return null;
     }
+    if (result == 'Infinity') return null;
     return result;
   };
 
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 69849cc72..e6ca47f91 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -347,13 +347,13 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   };
 
   this.setAmount = function(amount, alternativeAmount, useAlternativeAmount) {
+    $scope.showAlternative = useAlternativeAmount;
     var amountResult;
+
     if (useAlternativeAmount) {
       amountResult = parseFloat((rateService.fromFiat(alternativeAmount, self.alternativeIsoCode) * self.satToUnit).toFixed(self.unitDecimals), 10);
-      $scope.showAlternative = true;
     } else {
       amountResult = amount;
-      $scope.showAlternative = false;
     }
     self.setForm(null, amountResult, null);
   };