diff --git a/CHANGES.txt b/CHANGES.txt
index 20afe6819e..6110d2d8d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@
  * Streaming progress virtual table lock contention can trigger TCP_USER_TIMEOUT and fail streaming (CASSANDRA-18110)
  * Fix perpetual load of denylist on read in cases where denylist can never be loaded (CASSANDRA-18116)
 Merged from 4.0:
+ * Connect to listen address when own broadcast address is requested (CASSANDRA-18200)
  * Add safeguard so cleanup fails when node has pending ranges (CASSANDRA-16418)
  * Fix legacy clustering serialization for paging with compact storage (CASSANDRA-17507)
  * Add support for python 3.11 (CASSANDRA-18088)
diff --git a/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java b/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java
index 599e7178b5..f886df16ee 100644
--- a/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java
+++ b/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java
@@ -453,6 +453,8 @@ public class OutboundConnectionSettings
         InetAddressAndPort connectTo = this.connectTo;
         if (connectTo == null)
             connectTo = SystemKeyspace.getPreferredIP(to);
+        if (FBUtilities.getBroadcastAddressAndPort().equals(connectTo))
+            return FBUtilities.getLocalAddressAndPort();
         return connectTo;
     }