diff --git a/src/lib_p2p/p2p_fd.ml b/src/lib_p2p/p2p_fd.ml
index 6ca4160a7a6d05425acf3706e02336cdddc5b4fa..56f39eadff069cc2f6b0e1ca282997bc9543809d 100644
--- a/src/lib_p2p/p2p_fd.ml
+++ b/src/lib_p2p/p2p_fd.ml
@@ -170,6 +170,14 @@ let create_listening_socket ?(reuse_port = false) ~backlog
       let sock = raw_socket () in
       (if reuse_port then Lwt_unix.(setsockopt sock SO_REUSEPORT true)) ;
       Lwt_unix.(setsockopt sock SO_REUSEADDR true) ;
+
+      (* By setting [SO_KEEPALIVE] to [true], the socket is configured to send
+         periodic keep-alive probes to verify that the connection is still
+         active.
+
+         It reset (send TCP RST message and close) if the peer is
+         unresponsive. *)
+      Lwt_unix.(setsockopt sock SO_KEEPALIVE true) ;
       let*! () =
         Lwt_unix.bind
           sock