diff --git a/ssh2transport.c b/ssh2transport.c
index 3d1d7abb..e9b17fa4 100644
--- a/ssh2transport.c
+++ b/ssh2transport.c
@@ -837,7 +837,7 @@ static void ssh2_write_kexinit_lists(
                 add_to_commasep(list, kexlists[i][j].name);
             }
         }
-        if (i == KEXLIST_KEX) {
+        if (i == KEXLIST_KEX && first_time) {
             if (our_hostkeys)          /* we're the server */
                 add_to_commasep(list, "ext-info-s");
             else                       /* we're the client */