diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c
index c62cb669a..b1d8dc9ff 100644
--- a/lightningd/peer_htlcs.c
+++ b/lightningd/peer_htlcs.c
@@ -377,7 +377,7 @@ void fulfill_htlc(struct htlc_in *hin, const struct preimage *preimage)
 		return;
 	}
 
-	if (channel_on_chain(channel)) {
+	if (streq(channel->owner->name, "onchaind")) {
 		msg = towire_onchaind_known_preimage(hin, preimage);
 	} else {
 		struct fulfilled_htlc fulfilled_htlc;