diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index cacedcaf9..80471d4c5 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -2343,7 +2343,7 @@ int mbedtls_ssl_flight_transmit( mbedtls_ssl_context *ssl )
         return( ret );
 
     /* Update state and set timer */
-    if( ssl->state == MBEDTLS_SSL_HANDSHAKE_OVER )
+    if( mbedtls_ssl_is_handshake_over( ssl ) == 1 )
         ssl->handshake->retransmit_state = MBEDTLS_SSL_RETRANS_FINISHED;
     else
     {