diff --git a/public/views/paymentUri.html b/public/views/paymentUri.html
index 9d3b97eea..0c5ece585 100644
--- a/public/views/paymentUri.html
+++ b/public/views/paymentUri.html
@@ -5,20 +5,20 @@
 </div>
 
 <div class="content p20v row payment-uri" ng-controller="paymentUriController as payment">
-  <div class="large-12 columns" ng-init="uri = payment.checkBitcoinUri()">
-    <div class="panel text-center" ng-show="!uri">
+  <div class="large-12 columns" ng-init="payment.checkBitcoinUri()">
+    <div class="panel text-center" ng-if="!payment.uri">
       <h1 translate>Bitcoin URI is NOT valid!</h1>
     </div>
-    <div ng-show="uri">
+    <div ng-if="payment.uri">
       <h1 translate>Make a payment to</h1>
       <div class="panel size-14">
-        <div class="ellipsis"><b translate>Address</b>: {{uri.address.toString()}}</div>
-        <div ng-show="uri.amount"><b translate>Amount</b>: {{uri.amount}}</div>
-        <div ng-show="uri.message"><b translate>Message</b>: {{uri.message}}</div>
-        <div ng-show="uri.network == 'testnet'"><b translate>Network</b>: {{uri.network}}</div>
+        <div class="ellipsis"><b translate>Address</b>: {{payment.uri.address.toString()}}</div>
+        <div ng-show="payment.uri.amount"><b translate>Amount</b>: {{payment.uri.amount}}</div>
+        <div ng-show="payment.uri.message"><b translate>Message</b>: {{payment.uri.message}}</div>
+        <div ng-show="payment.uri.network == 'testnet'"><b translate>Network</b>: {{payment.uri.network}}</div>
       </div>
       <h2 translate>Select a wallet</h2>
-      <ul class="no-bullet" ng-init="wallets = payment.getWallets(uri.network)">
+      <ul class="no-bullet" ng-init="wallets = payment.getWallets(payment.uri.network)">
         <li class="panel" ng-repeat="w in wallets">
         <a ng-click="payment.selectWallet(w.id)">
           <div class="avatar-wallet" 
diff --git a/src/js/controllers/paymentUri.js b/src/js/controllers/paymentUri.js
index 5d0cddefe..831c5c791 100644
--- a/src/js/controllers/paymentUri.js
+++ b/src/js/controllers/paymentUri.js
@@ -29,9 +29,11 @@ angular.module('copayApp.controllers').controller('paymentUriController',
         var satToUnit = 1 / unitToSatoshi;
         var unitName = config.unitName;
 
-        uri.amount = strip(uri.amount * satToUnit) + ' ' + unitName;
+        if (uri.amount) {
+          uri.amount = strip(uri.amount * satToUnit) + ' ' + unitName;
+        }
         uri.network = uri.address.network.name;
-        return uri;
+        this.uri = uri;
       }
     };