diff -u -r1.126 -r1.127
--- ssh/kex.c	2016/09/28 21:44:52	1.126
+++ ssh/kex.c	2016/10/10 19:28:48	1.127
@@ -461,6 +461,7 @@
 	if (kex == NULL)
 		return SSH_ERR_INVALID_ARGUMENT;
 
+	ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
 	ptr = sshpkt_ptr(ssh, &dlen);
 	if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
 		return r;