diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js
index 725247970..b07b97462 100644
--- a/src/js/controllers/disclaimer.js
+++ b/src/js/controllers/disclaimer.js
@@ -18,7 +18,7 @@ angular.module('copayApp.controllers').controller('disclaimerController',
         if (err) {
 
           if (err == 'EEXISTS') {
-            storageService.getCopayDisclaimerFlag(function(val) {
+            storageService.getCopayDisclaimerFlag(function(err, val) {
               if (val) return go.walletHome();
               $scope.creatingProfile = false;
             });
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index f75651ccb..38fc751bb 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1325,14 +1325,17 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   $rootScope.$on('Local/NewFocusedWallet', function() {
     self.setFocusedWallet();
     self.updateTxHistory();
-    storageService.getCleanAndScanAddresses(function(err, walletId) {
-      if (walletId && profileService.walletClients[walletId]) {
-        $log.debug('Clear last address cache and Scan ', walletId);
-        addressService.expireAddress(walletId, function(err) {
-          self.startScan(walletId);
-        });
-        storageService.removeCleanAndScanAddresses(function() {});
-      }
+    storageService.getCopayDisclaimerFlag(function(err, val) {
+      if (val) go.walletHome();
+      storageService.getCleanAndScanAddresses(function(err, walletId) {
+        if (walletId && profileService.walletClients[walletId]) {
+          $log.debug('Clear last address cache and Scan ', walletId);
+          addressService.expireAddress(walletId, function(err) {
+            self.startScan(walletId);
+          });
+          storageService.removeCleanAndScanAddresses(function() {});
+        }
+      });
     });
   });