diff --git a/fundingmanager.go b/fundingmanager.go
index dc41c78634..99161a1447 100644
--- a/fundingmanager.go
+++ b/fundingmanager.go
@@ -2348,9 +2348,6 @@ func (f *fundingManager) annAfterSixConfs(completeChan *channeldb.OpenChannel,
 		if fwdMaxHTLC > capacityMSat {
 			fwdMaxHTLC = capacityMSat
 		}
-		if fwdMaxHTLC > MaxPaymentMSat {
-			fwdMaxHTLC = MaxPaymentMSat
-		}
 
 		// Create and broadcast the proofs required to make this channel
 		// public and usable for other nodes for routing.
diff --git a/peer.go b/peer.go
index be7ace3df4..ade90b41b5 100644
--- a/peer.go
+++ b/peer.go
@@ -531,9 +531,6 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) (
 				FeeRate:       selfPolicy.FeeProportionalMillionths,
 				TimeLockDelta: uint32(selfPolicy.TimeLockDelta),
 			}
-			if forwardingPolicy.MaxHTLC > MaxPaymentMSat {
-				forwardingPolicy.MaxHTLC = MaxPaymentMSat
-			}
 		} else {
 			peerLog.Warnf("Unable to find our forwarding policy "+
 				"for channel %v, using default values",
@@ -1865,9 +1862,6 @@ out:
 				FeeRate:       defaultPolicy.FeeRate,
 				TimeLockDelta: defaultPolicy.TimeLockDelta,
 			}
-			if forwardingPolicy.MaxHTLC > MaxPaymentMSat {
-				forwardingPolicy.MaxHTLC = MaxPaymentMSat
-			}
 
 			// Create the link and add it to the switch.
 			err = p.addLink(