diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index e02855273..1057d5c69 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -3,11 +3,7 @@
 angular.module('copayApp.controllers').controller('preferencesController',
   function($scope, $rootScope, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService) {
     var wallet;
-    var walletId; 
-
-    $scope.encryptEnabled = {
-      value: walletService.isEncrypted(wallet)
-    };
+    var walletId;
 
     $scope.hiddenBalanceChange = function() {
       var opts = {
@@ -80,7 +76,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
       wallet = profileService.getWallet(data.stateParams.walletId);
       walletId = wallet.credentials.walletId;
       $scope.wallet = wallet;
-      
+
       $scope.externalSource = null;
 
       if (!wallet)
@@ -92,6 +88,10 @@ angular.module('copayApp.controllers').controller('preferencesController',
         value: $scope.wallet.balanceHidden
       };
 
+      $scope.encryptEnabled = {
+        value: walletService.isEncrypted(wallet)
+      };
+
       $scope.touchIdAvailable = fingerprintService.isAvailable();
       $scope.touchIdEnabled = {
         value: config.touchIdFor ? config.touchIdFor[walletId] : null