diff --git a/massa-protocol-worker/src/handlers/peer_handler/mod.rs b/massa-protocol-worker/src/handlers/peer_handler/mod.rs
index 7a8a867704a..ee293979b39 100644
--- a/massa-protocol-worker/src/handlers/peer_handler/mod.rs
+++ b/massa-protocol-worker/src/handlers/peer_handler/mod.rs
@@ -578,8 +578,9 @@ impl InitConnectionHandler<PeerId, Context, MessagesHandler> for MassaHandshake
                 warn!("Failed to serialize message: {}", err);
                 return;
             }
-            //TODO: Make it non blockable
-            if let Err(err) = endpoint.send::<PeerId>(buf.as_slice()) {
+            if let Err(err) =
+                endpoint.send_timeout::<PeerId>(buf.as_slice(), Duration::from_millis(200))
+            {
                 warn!("Failed to send message: {}", err);
                 return;
             }