diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 7f5ea76..86c2953 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3849,6 +3849,10 @@
 
     SSL_DEBUG_MSG( 2, ( "=> handshake" ) );
 
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    ssl->handshake->key_cert = ssl->key_cert;
+#endif
+
     while( ssl->state != SSL_HANDSHAKE_OVER )
     {
         ret = ssl_handshake_step( ssl );