diff --git a/htlcswitch/link.go b/htlcswitch/link.go
index 2aeb9707e..f56d2865e 100644
--- a/htlcswitch/link.go
+++ b/htlcswitch/link.go
@@ -2210,9 +2210,8 @@ func (l *channelLink) processRemoteAdds(fwdPkg *channeldb.FwdPkg,
 
 			// We'll also ensure that our time-lock value has been
 			// computed correctly.
-			//
-			// TODO(roasbeef): also accept global default?
-			expectedHeight := heightNow + l.cfg.FwrdingPolicy.TimeLockDelta
+			minCltvDelta := uint32(invoice.Terms.FinalCltvDelta)
+			expectedHeight := heightNow + minCltvDelta
 			switch {
 
 			case !l.cfg.DebugHTLC && fwdInfo.OutgoingCTLV < expectedHeight: