diff --git a/tmate-ssh-latency.c b/tmate-ssh-latency.c
index d5759887..f503adab 100644
--- a/tmate-ssh-latency.c
+++ b/tmate-ssh-latency.c
@@ -29,6 +29,13 @@ static void on_keepalive_timer(__unused evutil_socket_t fd,
 {
 	struct tmate_ssh_client *client = arg;
 
+	/*
+	 * libssh-0.8.4 or higher have a broken keepalive implementation due
+	 * to packet filtering.
+	 */
+	if (ssh_version(SSH_VERSION_INT(0,8,4)))
+		return;
+
 	if (ssh_send_keepalive(client->session) == SSH_ERROR)
 		return;