diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 7f1d3d7f7..8e84d190a 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -115,7 +115,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     var fc = profileService.focusedClient;
     if (!fc) return;
 
-    ongoingProcess.clear();
     self.cleanInstance();
     self.loadingWallet = true;
     self.setSpendUnconfirmed();
@@ -1411,12 +1410,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.tab = 'walletHome';
   });
 
-  $rootScope.$on('Local/ValidatingWallet', function(ev, walletId) {
-    ongoingProcess.set('validatingWallet', true);
-  });
-
   $rootScope.$on('Local/ValidatingWalletEnded', function(ev, walletId, isOK) {
-    ongoingProcess.set('validatingWallet', false);
 
     if (self.isInFocus(walletId)) {
       // NOTE: If the user changed the wallet, the flag is already turn off.
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 99df9c84a..aae3c39d8 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -129,8 +129,8 @@ angular.module('copayApp.controllers').controller('joinController',
       ongoingProcess.set('joiningWallet', true);
       $timeout(function() {
         profileService.joinWallet(opts, function(err) {
+          ongoingProcess.set('joiningWallet', false);
           if (err) {
-            ongoingProcess.set('joiningWallet', false);
             self.error = err;
             $rootScope.$apply();
             return;
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 4372fd48b..2e4a8dc7d 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -139,7 +139,6 @@ angular.module('copayApp.services')
       var walletId = client.credentials.walletId;
 
       $log.debug('ValidatingWallet: ' + walletId + ' skip Device:' + skipDeviceValidation);
-      $rootScope.$emit('Local/ValidatingWallet', walletId);
       $timeout(function() {
         client.validateKeyDerivation({
           skipDeviceValidation: skipDeviceValidation,