diff --git a/cmd/relaysrv/listener.go b/cmd/relaysrv/listener.go
index 2091b1dd6..88fe8fd0f 100644
--- a/cmd/relaysrv/listener.go
+++ b/cmd/relaysrv/listener.go
@@ -161,6 +161,15 @@ func protocolConnectionHandler(tcpConn net.Conn, config *tls.Config) {
 				}
 				conn.Close()
 
+			case protocol.Ping:
+				if err := protocol.WriteMessage(conn, protocol.Pong{}); err != nil {
+					if debug {
+						log.Println("Error writing pong:", err)
+					}
+					conn.Close()
+					continue
+				}
+
 			case protocol.Pong:
 				// Nothing