diff --git a/library/ssl_client.c b/library/ssl_client.c
index ea64b21..eb52e70 100644
--- a/library/ssl_client.c
+++ b/library/ssl_client.c
@@ -769,7 +769,6 @@
             ssl->tls_version = session_negotiate->tls_version;
             ssl->handshake->min_tls_version = ssl->tls_version;
         } else {
-            ssl->tls_version = ssl->conf->max_tls_version;
             ssl->handshake->min_tls_version = ssl->conf->min_tls_version;
         }
     }
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index ad019b1..6a7fa96 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1393,6 +1393,7 @@
     if ((ret = ssl_conf_check(ssl)) != 0) {
         return ret;
     }
+    ssl->tls_version = ssl->conf->max_tls_version;
 
     /*
      * Prepare base structures