diff --git a/substrate/core/network-libp2p/src/service_task.rs b/substrate/core/network-libp2p/src/service_task.rs
index f6d5769b478b040b9e44591365eb18ccdf7d59eb..3577a64ecf5a5e6356dd963a6b243bda6f3ba6f8 100644
--- a/substrate/core/network-libp2p/src/service_task.rs
+++ b/substrate/core/network-libp2p/src/service_task.rs
@@ -342,8 +342,8 @@ where TMessage: CustomMessage + Send + 'static {
 
 	/// Get debug info for a given peer.
 	pub fn peer_debug_info(&self, who: NodeIndex) -> String {
-		if let (Some(peer_id), Some(addr)) = (self.peer_id_of_node(who), self.node_endpoint(who)) {
-			format!("{:?} through {:?}", peer_id, addr)
+		if let Some(info) = self.nodes_info.get(&who) {
+			format!("{:?} (version: {:?}) through {:?}", info.peer_id, info.client_version, info.endpoint)
 		} else {
 			"unknown".to_string()
 		}