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;