diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index dad46a8b3..d74cebb31 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -50,9 +50,12 @@
         <span class="badge badge-assertive" ng-show="!item.isComplete()" translate>
           Incomplete
         </span>
-        <span class="item-note"  ng-show="item.isComplete()">
+        <span class="item-note"  ng-show="item.isComplete() && !item.balanceHidden">
           {{item.status.availableBalanceStr}}
         </span>
+        <span class="item-note"  ng-show="item.isComplete() && item.balanceHidden">
+          <strong class="size-12" translate>[Balance Hidden]</strong>
+        </span>
       </a>
       <a ui-sref="bitpayCard.main" ng-show="externalServices.BitpayCard" class="item item-icon-left">
         <i class="icon ion-card"></i>BitPay Card
diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html
index c69b571a6..498be236f 100644
--- a/public/views/walletDetails.html
+++ b/public/views/walletDetails.html
@@ -44,7 +44,7 @@
           </div>
 
 
-          <div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !shouldHideBalance" on-hold="hideToggle()">
+          <div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden" on-hold="hideToggle()">
             <strong class="size-36">{{status.totalBalanceStr}}</strong>
             <div class="size-14" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
             <div class="size-14" ng-if="status.pendingAmount">
@@ -52,7 +52,7 @@
             </div>
           </div>
 
-          <div ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && shouldHideBalance" on-hold="hideToggle()">
+          <div ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && wallet.balanceHidden" on-hold="hideToggle()">
             <strong class="size-24" translate>[Balance Hidden]</strong>
             <div class="size-14" translate>
               Tap and hold to show
diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index 91222f9e3..ce4deae08 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -175,16 +175,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     $scope.updateTxHistory(cb);
   }
 
-  var hideBalance = function() {
-    storageService.getHideBalanceFlag(wallet.credentials.walletId, function(err, shouldHideBalance) {
-      if (err) $scope.shouldHideBalance = false;
-      else $scope.shouldHideBalance = (shouldHideBalance == 'true') ? true : false;
-    });
-  }
-
   $scope.hideToggle = function() {
-    $scope.shouldHideBalance = !$scope.shouldHideBalance;
-    storageService.setHideBalanceFlag(wallet.credentials.walletId, $scope.shouldHideBalance.toString(), function() {});
+    profileService.setHideBalanceFlag(wallet.credentials.walletId);
   }
 
   var currentTxHistoryPage;
@@ -204,7 +196,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     $scope.requiresMultipleSignatures = wallet.credentials.m > 1;
     $scope.newTx = false;
 
-    hideBalance();
     $ionicNavBarDelegate.title(wallet.name);
 
     $scope.updateAll(function() {
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 7085baa34..6ab120752 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -727,5 +727,9 @@ angular.module('copayApp.services')
       }, 'createdOn']);
     };
 
+    root.setHideBalanceFlag = function(walletId) {
+      root.wallet[walletId].balanceHidden = !root.wallet[walletId].balanceHidden;
+    }
+
     return root;
   });