diff --git a/js/controllers/paymentIntent.js b/js/controllers/paymentIntent.js
index f1cb486be..5b248194c 100644
--- a/js/controllers/paymentIntent.js
+++ b/js/controllers/paymentIntent.js
@@ -11,10 +11,12 @@ angular.module('copayApp.controllers').controller('PaymentIntentController', fun
   var wids = _.pluck($rootScope.iden.listWallets(), 'id');
   _.each(wids, function(wid) {
     var w = $rootScope.iden.getWalletById(wid);
-    $scope.wallets.push(w);
-    controllerUtils.updateBalance(w, function() {
-      $rootScope.$digest();
-    });
+    if (w && w.isReady()) {
+      $scope.wallets.push(w);
+      controllerUtils.updateBalance(w, function() {
+        $rootScope.$digest();
+      });
+    }
   });
 
   $scope.switchWallet = function(wid) {
diff --git a/views/paymentIntent.html b/views/paymentIntent.html
index 8a682220b..1491055bd 100644
--- a/views/paymentIntent.html
+++ b/views/paymentIntent.html
@@ -15,12 +15,11 @@
               <div class="ellipsis name-wallet">{{item.name || item.id}}</div>
             </div>
             <div class="oh">
-              <span ng-if="item.isReady() && item.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
-              <div ng-if="item.isReady() && !item.balanceInfo.updatingBalance" data-options="disable_for_touch:true">
+              <span ng-if="item.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
+              <div ng-if="!item.balanceInfo.updatingBalance" data-options="disable_for_touch:true">
                 <b class="m5r size-12">{{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}}</b>
                 <span class="alt-currency size-10">{{item.balanceInfo.totalBalanceAlternative |noFractionNumber:2}} {{item.balanceInfo.alternativeIsoCode}}</span>
               </div>
-              <span ng-if="!item.isReady()">Waiting for copayers...</span>
             </div>
           </a>
         </div>