diff --git a/config.go b/config.go
index 50a6fffa4..706fb7892 100644
--- a/config.go
+++ b/config.go
@@ -175,9 +175,10 @@ const (
 	defaultRemoteMaxHtlcs = 483
 
 	// defaultMaxLocalCSVDelay is the maximum delay we accept on our
-	// commitment output.
-	// TODO(halseth): find a more scientific choice of value.
-	defaultMaxLocalCSVDelay = 10000
+	// commitment output. The local csv delay maximum is now equal to
+	// the remote csv delay maximum we require for the remote commitment
+	// transaction.
+	defaultMaxLocalCSVDelay = 2016
 
 	// defaultChannelCommitInterval is the default maximum time between
 	// receiving a channel state update and signing a new commitment.
diff --git a/docs/release-notes/release-notes-0.17.0.md b/docs/release-notes/release-notes-0.17.0.md
index 0b80befd5..290a9c5f9 100644
--- a/docs/release-notes/release-notes-0.17.0.md
+++ b/docs/release-notes/release-notes-0.17.0.md
@@ -39,6 +39,10 @@ package](https://github.com/lightningnetwork/lnd/pull/7356)
 * [HTLC serialization updated](https://github.com/lightningnetwork/lnd/pull/7710) 
   to allow storing extra data transmitted in TLVs.
 
+* [MaxLocalCSVDelay now has a default value of 2016. It is still possible to 
+override this value with the config option --maxlocaldelay for those who rely
+on the old value of 10000](https://github.com/lightningnetwork/lnd/pull/7780).
+
 ## RPC
 
 * [SendOutputs](https://github.com/lightningnetwork/lnd/pull/7631) now adheres
diff --git a/funding/manager_test.go b/funding/manager_test.go
index 81c84bc57..1ca66904b 100644
--- a/funding/manager_test.go
+++ b/funding/manager_test.go
@@ -59,7 +59,7 @@ const (
 
 	// defaultMaxLocalCSVDelay is the maximum delay we accept on our
 	// commitment output.
-	defaultMaxLocalCSVDelay = 10000
+	defaultMaxLocalCSVDelay = 2016
 )
 
 var (