diff --git a/src/lib_dal_node/gossipsub/gs_logging.ml b/src/lib_dal_node/gossipsub/gs_logging.ml
index f1ab082639686f5e9a2c2066da5fa914eb28f35d..cb124451d5f990b1a3c7ad2fc64157aaf1c4aaa1 100644
--- a/src/lib_dal_node/gossipsub/gs_logging.ml
+++ b/src/lib_dal_node/gossipsub/gs_logging.ml
@@ -133,7 +133,13 @@ module Events = struct
       ("topic", Types.Topic.encoding)
 
   let ping =
-    declare_0 ~section ~name:(prefix "ping") ~msg:"Process Ping" ~level:Info ()
+    declare_1
+      ~section
+      ~name:(prefix "ping")
+      ~msg:"Process Ping from {peer}"
+      ~level:Info
+      ~pp1:P2p_peer.Id.pp
+      ("peer", P2p_peer.Id.encoding)
 
   let unsubscribe =
     declare_2
@@ -216,7 +222,9 @@ let event ~verbose =
       | Disconnection {peer} -> emit disconnection peer
       | In_message {from_peer; p2p_message} -> (
           match p2p_message with
-          | Ping -> emit ping ()
+          | Ping ->
+              if not verbose then Lwt.return_unit
+              else emit ping from_peer.peer_id
           | Message_with_header {message = _; topic; message_id} ->
               emit message_with_header (from_peer.peer_id, topic, message_id)
           | Subscribe {topic} -> emit subscribe (from_peer.peer_id, topic)
diff --git a/src/lib_gossipsub/gossipsub_worker.ml b/src/lib_gossipsub/gossipsub_worker.ml
index dfdd743b48aa5d82fb2028feaf0b23bd44353059..7cb53c56d9fa952132aa6e5566050c8f0fb09f68 100644
--- a/src/lib_gossipsub/gossipsub_worker.ml
+++ b/src/lib_gossipsub/gossipsub_worker.ml
@@ -633,7 +633,7 @@ module Make (C : Gossipsub_intf.WORKER_CONFIGURATION) :
 
      Add more verification/attacks protections as done in Rust. *)
 
-  let emit_pings state =
+  let may_emit_pings state =
     let gstate = state.gossip_state in
     let gstate_view = View.view gstate in
     let heartbeat_ping_interval =
@@ -655,7 +655,7 @@ module Make (C : Gossipsub_intf.WORKER_CONFIGURATION) :
     | state, GS.Heartbeat {to_graft; to_prune; noPX_peers} ->
         let gstate = state.gossip_state in
         let gstate_view = View.view gstate in
-        emit_pings state ;
+        may_emit_pings state ;
         let iter pmap mk_msg =
           Peer.Map.iter
             (fun peer topicset ->