diff --git a/lib/model/address.js b/lib/model/address.js
index a5da342..2590caf 100644
--- a/lib/model/address.js
+++ b/lib/model/address.js
@@ -13,6 +13,7 @@ Address.create = function(opts) {
 
   x.createdOn = Math.floor(Date.now() / 1000);
   x.address = opts.address;
+  x.walletId = opts.walletId;
   x.isChange = opts.isChange;
   x.path = opts.path;
   x.publicKeys = opts.publicKeys;
@@ -24,6 +25,7 @@ Address.fromObj = function(obj) {
 
   x.createdOn = obj.createdOn;
   x.address = obj.address;
+  x.walletId = obj.walletId;
   x.isChange = obj.isChange;
   x.path = obj.path;
   x.publicKeys = obj.publicKeys;
diff --git a/lib/model/copayer.js b/lib/model/copayer.js
index d5a3444..1845350 100644
--- a/lib/model/copayer.js
+++ b/lib/model/copayer.js
@@ -60,7 +60,11 @@ Copayer.prototype.createAddress = function(wallet, isChange) {
   $.checkState(wallet.isComplete());
 
   var path = this.addressManager.getNewAddressPath(isChange);
-  var address = Address.create(WalletUtils.deriveAddress(wallet.publicKeyRing, path, wallet.m, wallet.network));
+  var raw = Address.create(WalletUtils.deriveAddress(wallet.publicKeyRing, path, wallet.m, wallet.network));
+  var address = Address.create(_.extend(raw, {
+    walletId: wallet.id,
+  }));
+
   address.isChange = isChange;
   return address;
 };
diff --git a/lib/model/wallet.js b/lib/model/wallet.js
index 7cbe973..f95eda3 100644
--- a/lib/model/wallet.js
+++ b/lib/model/wallet.js
@@ -145,7 +145,10 @@ Wallet.prototype.createAddress = function(isChange) {
   $.checkState(this.isComplete());
 
   var path = this.addressManager.getNewAddressPath(isChange);
-  var address = Address.create(WalletUtils.deriveAddress(this.publicKeyRing, path, this.m, this.network));
+  var raw = WalletUtils.deriveAddress(this.publicKeyRing, path, this.m, this.network);
+  var address = Address.create(_.extend(raw, {
+    walletId: this.id,
+  }));
   address.isChange = isChange;
   return address;
 };