diff --git a/class/lightning-custodian-wallet.js b/class/lightning-custodian-wallet.js
index 14155df8a..a20974760 100644
--- a/class/lightning-custodian-wallet.js
+++ b/class/lightning-custodian-wallet.js
@@ -563,6 +563,10 @@ export class LightningCustodianWallet extends LegacyWallet {
 
     if (!decoded.expiry) decoded.expiry = '3600'; // default
 
+    if (parseInt(decoded.num_satoshis) === 0 && decoded.num_millisatoshis > 0) {
+      decoded.num_satoshis = (decoded.num_millisatoshis / 1000).toString();
+    }
+
     return (this.decoded_invoice_raw = decoded);
   }
 
diff --git a/screen/lnd/scanLndInvoice.js b/screen/lnd/scanLndInvoice.js
index 01889bb9b..af7f47963 100644
--- a/screen/lnd/scanLndInvoice.js
+++ b/screen/lnd/scanLndInvoice.js
@@ -216,7 +216,7 @@ export default class ScanLndInvoice extends React.Component {
     if (typeof this.state.decoded !== 'object') {
       return true;
     } else {
-      if (!this.state.decoded.hasOwnProperty('num_satoshis')) {
+      if (!this.state.decoded.num_satoshis) {
         return true;
       }
     }
diff --git a/tests/integration/LightningCustodianWallet.test.js b/tests/integration/LightningCustodianWallet.test.js
index ee574b76b..059309f69 100644
--- a/tests/integration/LightningCustodianWallet.test.js
+++ b/tests/integration/LightningCustodianWallet.test.js
@@ -120,7 +120,19 @@ describe('LightningCustodianWallet', () => {
     assert.ok(error);
   });
 
+  it('decode can handle zero sats but present msats', async () => {
+    let l = new LightningCustodianWallet();
+    let decoded = l.decodeInvoice(
+      'lnbc89n1p0zptvhpp5j3h5e80vdlzn32df8y80nl2t7hssn74lzdr96ve0u4kpaupflx2sdphgfkx7cmtwd68yetpd5s9xct5v4kxc6t5v5s9gunpdeek66tnwd5k7mscqp2sp57m89zv0lrgc9zzaxy5p3d5rr2cap2pm6zm4n0ew9vyp2d5zf2mfqrzjqfxj8p6qjf5l8du7yuytkwdcjhylfd4gxgs48t65awjg04ye80mq7z990yqq9jsqqqqqqqqqqqqq05qqrc9qy9qsq9mynpa9ucxg53hwnvw323r55xdd3l6lcadzs584zvm4wdw5pv3eksdlcek425pxaqrn9u5gpw0dtpyl9jw2pynjtqexxgh50akwszjgq4ht4dh',
+    );
+    assert.strictEqual(decoded.num_satoshis, '8.9');
+  });
+
   it('can decode invoice locally & remotely', async () => {
+    if (!process.env.BLITZHUB) {
+      console.error('process.env.BLITZHUB not set, skipped');
+      return;
+    }
     let l2 = new LightningCustodianWallet();
     l2.setSecret(process.env.BLITZHUB);
     await l2.authorize();