diff --git a/peer/brontide.go b/peer/brontide.go
index 24147663c..29fe0576f 100644
--- a/peer/brontide.go
+++ b/peer/brontide.go
@@ -3857,7 +3857,7 @@ func (p *Brontide) initRbfChanCloser(
 	spendEvent := protofsm.RegisterSpend[chancloser.ProtocolEvent]{
 		OutPoint:   channel.ChannelPoint(),
 		PkScript:   channel.FundingTxOut().PkScript,
-		HeightHint: scid.BlockHeight,
+		HeightHint: channel.DeriveHeightHint(),
 		PostSpendEvent: fn.Some[chancloser.RbfSpendMapper](
 			chancloser.SpendMapper,
 		),