diff --git a/blue_modules/BlueElectrum.js b/blue_modules/BlueElectrum.js
index 6bb1849c0..332c44560 100644
--- a/blue_modules/BlueElectrum.js
+++ b/blue_modules/BlueElectrum.js
@@ -307,6 +307,8 @@ module.exports.multiGetUtxoByAddress = async function (addresses, batchsize) {
 
     if (disableBatching) {
       // ElectrumPersonalServer doesnt support `blockchain.scripthash.listunspent`
+      // electrs OTOH supports it, but we dont know it we are currently connected to it or to EPS
+      // so it is pretty safe to do nothing, as caller can derive UTXO from stored transactions
     } else {
       results = await mainClient.blockchainScripthash_listunspentBatch(scripthashes);
     }
diff --git a/class/wallets/multisig-hd-wallet.js b/class/wallets/multisig-hd-wallet.js
index 5e6ee4655..a79bed006 100644
--- a/class/wallets/multisig-hd-wallet.js
+++ b/class/wallets/multisig-hd-wallet.js
@@ -679,6 +679,8 @@ export class MultisigHDWallet extends AbstractHDElectrumWallet {
       });
       const witnessScript = p2wsh.redeem.output;
 
+      if (!input.txhex) throw new Error('Electrum server didnt provide txhex to properly create PSBT transaction');
+
       psbt.addInput({
         hash: input.txId,
         index: input.vout,
@@ -932,7 +934,7 @@ export class MultisigHDWallet extends AbstractHDElectrumWallet {
       newUtxos.push(u);
     }
 
-    return newUtxos;
+    this._utxo = newUtxos;
   }
 
   getID() {