diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index 774fa0906..a69b505c1 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -884,7 +884,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
   var createAddress = function(wallet, cb) {
     $log.debug('Creating address for wallet:', wallet.id);
 
-    wallet.createAddress({}, function(err, addr) {
+    wallet.createAddress({}, function onWalletCreatedAddress(err, addr) {
       if (err) {
         var prefix = gettextCatalog.getString('Could not create address');
         if (err instanceof errors.CONNECTION_ERROR || (err.message && err.message.match(/5../))) {
@@ -902,6 +902,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
             if (err) return cb(err);
             return cb(null, addr[0].address);
           });
+          return;
         }
         return bwcError.cb(err, prefix, cb);
       }