diff --git a/lib/node/node.js b/lib/node/node.js
index b1ddffe6..c8b73d64 100644
--- a/lib/node/node.js
+++ b/lib/node/node.js
@@ -305,10 +305,13 @@ Node.prototype.openWallet = co(function* openWallet() {
     'Loaded wallet with id=%s wid=%d address=%s',
     wallet.id, wallet.wid, wallet.getAddress());
 
-  if (this.miner)
+  if (this.miner && this.miner.addresses.length === 0)
     this.miner.addAddress(wallet.getAddress());
 
   this.wallet = wallet;
+
+  if (this.http && this.http.rpc && !this.http.rpc.wallet)
+    this.http.rpc.wallet = wallet;
 });
 
 /*