diff --git a/funding/manager.go b/funding/manager.go
index 67e4f33c5..fb91011c4 100644
--- a/funding/manager.go
+++ b/funding/manager.go
@@ -2920,8 +2920,8 @@ func (f *Manager) waitForFundingConfirmation(
 
 	// If the underlying channel is a zero-conf channel, we'll set numConfs
 	// to 6, since it will be zero here.
-	if completeChan.IsZeroConf() {
-		numConfs = 6
+	if completeChan.IsZeroConf() || numConfs == 0 {
+		numConfs = 1
 	}
 
 	confNtfn, err := f.cfg.Notifier.RegisterConfirmationsNtfn(
diff --git a/server.go b/server.go
index 6ab197f86..f268c78f8 100644
--- a/server.go
+++ b/server.go
@@ -1348,6 +1348,8 @@ func newServer(cfg *Config, listenAddrs []net.Addr,
 		DefaultMinHtlcIn:     cc.MinHtlcIn,
 		NumRequiredConfs: func(chanAmt btcutil.Amount,
 			pushAmt lnwire.MilliSatoshi) uint16 {
+
+			return 0
 			// For large channels we increase the number
 			// of confirmations we require for the
 			// channel to be considered open. As it is