diff --git a/validator/src/main.rs b/validator/src/main.rs
index 074f0355a..95b6fad5a 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -1089,7 +1089,23 @@ pub fn main() {
     }
 
     if let Some(ref cluster_entrypoint) = cluster_entrypoint {
-        let udp_sockets = vec![&node.sockets.gossip, &node.sockets.repair];
+        let udp_sockets = [
+            node.sockets.tpu.first(),
+            /*
+            Enable these ports when `IpEchoServerMessage` supports more than 4 UDP ports:
+                node.sockets.tpu_forwards.first(),
+                node.sockets.tvu.first(),
+                node.sockets.tvu_forwards.first(),
+                node.sockets.broadcast.first(),
+                node.sockets.retransmit_sockets.first(),
+            */
+            Some(&node.sockets.gossip),
+            Some(&node.sockets.repair),
+            Some(&node.sockets.serve_repair),
+        ]
+        .iter()
+        .filter_map(|x| *x)
+        .collect::<Vec<_>>();
 
         let mut tcp_listeners = vec![];
         if !private_rpc {