diff --git a/docs/release-notes/release-notes-0.17.3.md b/docs/release-notes/release-notes-0.17.3.md
index 1cbfe8cf8..8041603b4 100644
--- a/docs/release-notes/release-notes-0.17.3.md
+++ b/docs/release-notes/release-notes-0.17.3.md
@@ -26,6 +26,8 @@
 * [Fixed](https://github.com/lightningnetwork/lnd/pull/8220) a loop variable
   issue which may affect programs built using go `v1.20` and below. 
 
+* [An issue where LND would hang on shutdown has been fixed.](https://github.com/lightningnetwork/lnd/pull/8151)
+
 # New Features
 ## Functional Enhancements
 ## RPC Additions
@@ -47,4 +49,5 @@
 ## Tooling and Documentation
 
 # Contributors (Alphabetical Order)
+* Eugene Siegel
 * Yong Yu
diff --git a/routing/router.go b/routing/router.go
index c70a824fa..48aeead18 100644
--- a/routing/router.go
+++ b/routing/router.go
@@ -1590,7 +1590,7 @@ func (r *ChannelRouter) processUpdate(msg interface{},
 		// to obtain the full funding outpoint that's encoded within
 		// the channel ID.
 		channelID := lnwire.NewShortChanIDFromInt(msg.ChannelID)
-		fundingTx, err := r.fetchFundingTx(&channelID)
+		fundingTx, err := r.fetchFundingTxWrapper(&channelID)
 		if err != nil {
 			// In order to ensure we don't erroneously mark a
 			// channel as a zombie due to an RPC failure, we'll
@@ -1800,6 +1800,36 @@ func (r *ChannelRouter) processUpdate(msg interface{},
 	return nil
 }
 
+// fetchFundingTxWrapper is a wrapper around fetchFundingTx, except that it
+// will exit if the router has stopped.
+func (r *ChannelRouter) fetchFundingTxWrapper(chanID *lnwire.ShortChannelID) (
+	*wire.MsgTx, error) {
+
+	txChan := make(chan *wire.MsgTx, 1)
+	errChan := make(chan error, 1)
+
+	go func() {
+		tx, err := r.fetchFundingTx(chanID)
+		if err != nil {
+			errChan <- err
+			return
+		}
+
+		txChan <- tx
+	}()
+
+	select {
+	case tx := <-txChan:
+		return tx, nil
+
+	case err := <-errChan:
+		return nil, err
+
+	case <-r.quit:
+		return nil, ErrRouterShuttingDown
+	}
+}
+
 // fetchFundingTx returns the funding transaction identified by the passed
 // short channel ID.
 //