diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js
index 0123d47ab..05a823a3e 100644
--- a/src/js/controllers/bitpayCard.js
+++ b/src/js/controllers/bitpayCard.js
@@ -143,6 +143,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
       $state.go('tabs.home');
     }
 
+    
     bitpayCardService.get({
       cardId: $scope.cardId,
       noRefresh: true,
diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js
index 0e12e7fb8..a2ce4aa52 100644
--- a/src/js/services/bitpayCardService.js
+++ b/src/js/services/bitpayCardService.js
@@ -176,18 +176,18 @@ angular.module('copayApp.services').factory('bitpayCardService', function($log,
   };
 
   root.getLastKnownBalance = function(cardId, cb) {
-     storageService.getBalanceCache(cardId, cb);
+    storageService.getBalanceCache(cardId, cb);
   };
 
   root.addLastKnownBalance = function(card, cb) {
-    var now =  Math.floor(Date.now()/1000);
-    var showRange = 600 ; // 10min;
-    
-    root.getLastKnownBalance(card.eid, function(err, data){
+    var now = Math.floor(Date.now() / 1000);
+    var showRange = 600; // 10min;
+
+    root.getLastKnownBalance(card.eid, function(err, data) {
       if (data) {
         data = JSON.parse(data);
         card.balance = data.balance;
-        card.updatedOn = ( data.updatedOn < now - showRange) ? data.updatedOn : null;
+        card.updatedOn = (data.updatedOn < now - showRange) ? data.updatedOn : null;
       }
       return cb();
     });
@@ -197,7 +197,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($log,
 
     storageService.setBalanceCache(cardId, {
       balance: balance,
-      updatedOn: Math.floor(Date.now()/1000),
+      updatedOn: Math.floor(Date.now() / 1000),
     }, cb);
   };
 
@@ -232,15 +232,18 @@ angular.module('copayApp.services').factory('bitpayCardService', function($log,
         return cb();
       }
 
-      // Async, no problem
-      lodash.each(cards, function(x){
+      if (opts.cardId) {
+        cards = lodash.filter(cards, function(x) {
+          return opts.cardId == x.eid;
+        });
+      }
 
-        if (opts.cardId) {
-          if (opts.cardId != x.eid) return;
-        }
+      // Async, no problem
+      lodash.each(cards, function(x) {
 
         root.addLastKnownBalance(x, function() {});
 
+        // async refresh
         if (!opts.noRefresh) {
           root.getHistory(x.id, {}, function(err, data) {
             if (err) return;