diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index ceb692ea56..0a07e06c40 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -49,10 +49,11 @@ int mbedtls_ssl_tls13_handshake_client_step( mbedtls_ssl_context *ssl )
 
     switch( ssl->state )
     {
+        /* 
+         * ssl->state is initialized as HELLO_REQUEST. It is same
+         * with CLIENT_HELLO status
+         */
         case MBEDTLS_SSL_HELLO_REQUEST:
-            mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_CLIENT_HELLO );
-            break;
-
         case MBEDTLS_SSL_CLIENT_HELLO:
             ret = ssl_tls13_write_client_hello( ssl );
             break;