diff --git a/fundingmanager.go b/fundingmanager.go
index 6105c5c3..47389591 100644
--- a/fundingmanager.go
+++ b/fundingmanager.go
@@ -882,7 +882,13 @@ func (f *fundingManager) waitForFundingConfirmation(
 
 	// Wait until the specified number of confirmations has been reached,
 	// or the wallet signals a shutdown.
-	confDetails := <-confNtfn.Confirmed
+	confDetails, ok := <-confNtfn.Confirmed
+	if !ok {
+		fndgLog.Infof("ChainNotifier shutting down, cannot complete "+
+			"funding flow for ChannelPoint(%v)",
+			completeChan.FundingOutpoint)
+		return
+	}
 
 	fundingPoint := *completeChan.FundingOutpoint
 	fndgLog.Infof("ChannelPoint(%v) is now active",