diff --git a/include/libssh/kex.h b/include/libssh/kex.h
index f6a61461..6da6693c 100644
--- a/include/libssh/kex.h
+++ b/include/libssh/kex.h
@@ -37,7 +37,7 @@ extern "C" {
 
 SSH_PACKET_CALLBACK(ssh_packet_kexinit);
 
-int ssh_send_kex(ssh_session session, int server_kex);
+int ssh_send_kex(ssh_session session);
 void ssh_list_kex(struct ssh_kex_struct *kex);
 int ssh_set_client_kex(ssh_session session);
 int ssh_kex_select_methods(ssh_session session);
diff --git a/src/client.c b/src/client.c
index 7ac60184..3cc8487d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -424,7 +424,7 @@ static void ssh_client_connection_callback(ssh_session session)
         if (rc != SSH_OK) {
             goto error;
         }
-        rc = ssh_send_kex(session, 0);
+        rc = ssh_send_kex(session);
         if (rc < 0) {
             goto error;
         }
@@ -443,7 +443,7 @@ static void ssh_client_connection_callback(ssh_session session)
             if (rc != SSH_OK) {
                 goto error;
             }
-            rc = ssh_send_kex(session, 0);
+            rc = ssh_send_kex(session);
             if (rc < 0) {
                 goto error;
             }
diff --git a/src/kex.c b/src/kex.c
index 46b61143..072f6d0e 100644
--- a/src/kex.c
+++ b/src/kex.c
@@ -865,9 +865,9 @@ int ssh_kex_select_methods (ssh_session session)
 
 
 /* this function only sends the predefined set of kex methods */
-int ssh_send_kex(ssh_session session, int server_kex)
+int ssh_send_kex(ssh_session session)
 {
-    struct ssh_kex_struct *kex = (server_kex ?
+    struct ssh_kex_struct *kex = (session->server ?
         &session->next_crypto->server_kex :
         &session->next_crypto->client_kex);
     ssh_string str = NULL;
@@ -969,7 +969,7 @@ int ssh_send_rekex(ssh_session session)
     }
 
     session->dh_handshake_state = DH_STATE_INIT;
-    rc = ssh_send_kex(session, session->server);
+    rc = ssh_send_kex(session);
     if (rc < 0) {
         SSH_LOG(SSH_LOG_PACKET, "Failed to send kex");
         return rc;
diff --git a/src/server.c b/src/server.c
index 7ce15a5b..04a698a9 100644
--- a/src/server.c
+++ b/src/server.c
@@ -356,7 +356,7 @@ static void ssh_server_connection_callback(ssh_session session)
         ssh_packet_set_default_callbacks(session);
         set_status(session, 0.5f);
         session->session_state = SSH_SESSION_STATE_INITIAL_KEX;
-        rc = ssh_send_kex(session, 1);
+        rc = ssh_send_kex(session);
         if (rc < 0) {
             goto error;
         }
@@ -372,7 +372,7 @@ static void ssh_server_connection_callback(ssh_session session)
                 goto error;
             }
             /* We are in a rekeying, so we need to send the server kex */
-            rc = ssh_send_kex(session, 1);
+            rc = ssh_send_kex(session);
             if (rc < 0) {
                 goto error;
             }