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/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 (