diff --git a/onchaind/onchaind.c b/onchaind/onchaind.c
index 6859d327d..6c7049a42 100644
--- a/onchaind/onchaind.c
+++ b/onchaind/onchaind.c
@@ -1727,12 +1727,12 @@ static void output_spent(struct tracked_output ***outs,
 			break;
 
 		case THEIR_HTLC:
-			record_external_deposit(out, out->tx_blockheight,
-						HTLC_TIMEOUT);
-			record_external_spend(&tx_parts->txid, out,
-					      tx_blockheight, HTLC_TIMEOUT);
-
 			if (out->tx_type == THEIR_REVOKED_UNILATERAL) {
+				record_external_deposit(out, out->tx_blockheight,
+							HTLC_TIMEOUT);
+				record_external_spend(&tx_parts->txid, out,
+						      tx_blockheight, HTLC_TIMEOUT);
+
 				/* we've actually got a 'new' output here */
 				steal_htlc_tx(out, outs, tx_parts,
 					      tx_blockheight,
diff --git a/tests/test_closing.py b/tests/test_closing.py
index 70b989987..4cc07dea4 100644
--- a/tests/test_closing.py
+++ b/tests/test_closing.py
@@ -2520,7 +2520,6 @@ def test_onchain_feechange(node_factory, bitcoind, executor):
     assert only_one(l2.rpc.listinvoices('onchain_timeout')['invoices'])['status'] == 'unpaid'
 
 
-@pytest.mark.skip("Lisa, please fix this!")
 @pytest.mark.developer("needs DEVELOPER=1 for dev-set-fees")
 def test_onchain_all_dust(node_factory, bitcoind, executor):
     """Onchain handling when we reduce output to all dust"""