diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 223443458..f159deeaf 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -408,9 +408,12 @@ angular.module('copayApp.services')
       var addressBook = str.addressBook || {};
       var historyCache = str.historyCache ||  [];
 
-      root.setMetaData(walletClient, addressBook, historyCache, function(err) {
-        if (err) console.log(err);
-        root._addWalletClient(walletClient, opts, cb);
+      root._addWalletClient(walletClient, opts, function(err, walletId) {
+        if (err) return cb(err);
+        root.setMetaData(walletClient, addressBook, historyCache, function(error) {
+          if (error) console.log(error);
+          return cb(err, walletId);
+        });
       });
     };