diff --git a/wallet/wallet.c b/wallet/wallet.c
index ddc933d70..1c7ad2337 100644
--- a/wallet/wallet.c
+++ b/wallet/wallet.c
@@ -6558,7 +6558,8 @@ struct wallet_htlc_iter *wallet_htlcs_first(const tal_t *ctx,
 					    ", h.updated_index"
 					    " FROM channel_htlcs h"
 					    " JOIN channels ON channels.id = h.channel_id"
-					    " WHERE h.updated_index >= ?"
+					    " WHERE channels.state != ?"
+					    "   AND h.updated_index >= ?"
 					    " ORDER BY h.updated_index ASC"
 					    " LIMIT ?;"));
 		} else {
@@ -6575,10 +6576,12 @@ struct wallet_htlc_iter *wallet_htlcs_first(const tal_t *ctx,
 					    ", h.updated_index"
 					    " FROM channel_htlcs h"
 					    " JOIN channels ON channels.id = h.channel_id"
-					    " WHERE h.id >= ?"
+					    " WHERE channels.state != ?"
+					    "   AND h.id >= ?"
 					    " ORDER BY h.id ASC"
 					    " LIMIT ?;"));
 		}
+		db_bind_int(i->stmt, channel_state_in_db(CLOSED));
 	}
 	db_bind_u64(i->stmt, liststart);
 	if (listlimit)