diff --git a/js/controllers/header.js b/js/controllers/header.js
index 1c0dc56e9..6f69a5d3a 100644
--- a/js/controllers/header.js
+++ b/js/controllers/header.js
@@ -23,7 +23,6 @@ angular.module('copay.header').controller('HeaderController',
 
     $rootScope.$watch('wallet', function(wallet) {
       if (wallet) {
-        controllerUtils.setSocketHandlers();
       }
     });
 
@@ -45,8 +44,8 @@ angular.module('copay.header').controller('HeaderController',
 
     $scope.refresh = function() {
       var w = $rootScope.wallet;
+      w.connectToAll();
       controllerUtils.updateBalance(function() {
-        w.connectToAll();
         $rootScope.$digest();
       });
     };
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 39a451de7..f7180c3c0 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -56,7 +56,6 @@ Wallet.prototype.connectToAll = function() {
     this.sendWalletReady(this.firstCopayerId);
     this.firstCopayerId = null;
   }
-  this.emit('refresh');
 };
 
 Wallet.prototype._handlePublicKeyRing = function(senderId, data, isInbound) {
@@ -206,8 +205,9 @@ Wallet.prototype.netStart = function() {
   }
 
   net.start(startOpts, function() {
-    self.emit('created', net.getPeer());
     self.connectToAll();
+    self.emit('created', net.getPeer());
+    self.emit('refresh');
   });
 };
 
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 70e5960b2..a3fbcc757 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -59,14 +59,15 @@ angular.module('copay.controllerUtils')
         $location.path('addresses');
       });
       w.on('refresh', function() {
-        root.setSocketHandlers();
         root.updateBalance(function() {
           $rootScope.$digest();
         });
         $rootScope.$digest();
       });
       w.on('publicKeyRingUpdated', function() {
-        root.setSocketHandlers();
+        root.updateBalance(function() {
+          $rootScope.$digest();
+        });
       });
       w.on('openError', root.onErrorDigest);
       w.on('peer', function(peerID) {