diff --git a/src/client_container.proto b/src/client_container.proto
index cc0f76f16..31c0fcad4 100644
--- a/src/client_container.proto
+++ b/src/client_container.proto
@@ -27,6 +27,7 @@ message ClientMessage {
         MUSICIAN_SESSION_JOIN = 114;
         MUSICIAN_SESSION_FRESH = 115;
         MUSICIAN_SESSION_STALE = 116;
+        HEARTBEAT_ACK = 117;
 
         TEST_SESSION_MESSAGE = 200;
 
@@ -70,6 +71,7 @@ message ClientMessage {
     optional MusicianSessionJoin        musician_session_join = 114;
     optional MusicianSessionFresh       musician_session_fresh = 115;
     optional MusicianSessionStale       musician_session_stale = 116;
+    optional HeartbeatAck               heartbeat_ack = 117;
 
     // Client-Session messages (to/from)  
     optional TestSessionMessage     test_session_message = 200;
@@ -228,11 +230,17 @@ message TestClientMessage {
 }
 
 // route_to: server
-// send from client to server periodically to know if session is gone
+// sent from client to server periodically to let server track if the client is truly alive and avoid TCP timeout scenarios
+// the server will send a HeartbeatAck in response to this
 message Heartbeat {
     
 }
 
+// target: client
+// sent from server to client in response to a Heartbeat
+message HeartbeatAck {
+}
+
 // target: client
 // send from server to client when user sends a friend request
 message FriendRequest {