diff --git a/docs/release-notes/release-notes-0.15.0.md b/docs/release-notes/release-notes-0.15.0.md
index 14e74678e..377100f76 100644
--- a/docs/release-notes/release-notes-0.15.0.md
+++ b/docs/release-notes/release-notes-0.15.0.md
@@ -72,6 +72,9 @@ then watch it on chain. Taproot script spends are also supported through the
   `lncli walletbalance` in existing wallets after upgrading to
   Taproot](https://github.com/lightningnetwork/lnd/pull/6379).
 
+* [Fixed a data race in the websocket proxy
+  code](https://github.com/lightningnetwork/lnd/pull/6380).
+
 ## Misc
 
 * [An example systemd service file](https://github.com/lightningnetwork/lnd/pull/6033)
diff --git a/lnrpc/websocket_proxy.go b/lnrpc/websocket_proxy.go
index 803cf6c36..7aaa9b1f2 100644
--- a/lnrpc/websocket_proxy.go
+++ b/lnrpc/websocket_proxy.go
@@ -253,7 +253,7 @@ func (p *WebsocketProxy) upgradeToWebSocketProxy(w http.ResponseWriter,
 				payload = newPayload
 			}
 
-			_, err = requestForwarder.Write(payload)
+			_, err := requestForwarder.Write(payload)
 			if err != nil {
 				p.logger.Errorf("WS: error writing message "+
 					"to upstream http server: %v", err)
@@ -338,7 +338,7 @@ func (p *WebsocketProxy) upgradeToWebSocketProxy(w http.ResponseWriter,
 			continue
 		}
 
-		err = conn.WriteMessage(
+		err := conn.WriteMessage(
 			websocket.TextMessage, responseForwarder.Bytes(),
 		)
 		if err != nil {