diff --git a/class/wallets/abstract-hd-electrum-wallet.js b/class/wallets/abstract-hd-electrum-wallet.js
index 9111e1470..8f83f29be 100644
--- a/class/wallets/abstract-hd-electrum-wallet.js
+++ b/class/wallets/abstract-hd-electrum-wallet.js
@@ -399,6 +399,8 @@ export class AbstractHDElectrumWallet extends AbstractHDWallet {
       txs = txs.concat(addressTxs);
     }
 
+    if (txs.length === 0) return []; // guard clause; so we wont spend time calculating addresses
+
     // its faster to pre-build hashmap of owned addresses than to query `this.weOwnAddress()`, which in turn
     // iterates over all addresses in hierarchy
     const ownedAddressesHashmap = {};
diff --git a/class/wallets/multisig-hd-wallet.js b/class/wallets/multisig-hd-wallet.js
index 719323bb0..f5b5ebb3b 100644
--- a/class/wallets/multisig-hd-wallet.js
+++ b/class/wallets/multisig-hd-wallet.js
@@ -190,6 +190,7 @@ export class MultisigHDWallet extends AbstractHDElectrumWallet {
         const xpub = this._getXpubFromCosigner(cosigner);
         const hdNode = HDNode.fromBase58(xpub);
         _node = hdNode.derive(nodeIndex);
+        this._nodes[nodeIndex][cosignerIndex] = _node;
       } else {
         _node = this._nodes[nodeIndex][cosignerIndex];
       }
@@ -487,7 +488,6 @@ export class MultisigHDWallet extends AbstractHDElectrumWallet {
             xpub = xpub.substr(0, xpub.indexOf('/'));
           }
 
-          // console.warn('m[2] = ', m[2], {hexFingerprint, path, xpub});
           this.addCosigner(xpub, hexFingerprint.toUpperCase(), path);
         }
       }