diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 12a8ff5..22787fd 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1069,6 +1069,8 @@
         return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );
     }
 
+    ssl_hs_rm_dtls_hdr( ssl );
+
 #if defined(POLARSSL_SSL_PROTO_DTLS)
     if( ssl->transport == SSL_TRANSPORT_DATAGRAM )
     {
@@ -1774,6 +1776,8 @@
         return( ret );
     }
 
+    ssl_hs_rm_dtls_hdr( ssl );
+
     if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
     {
         SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
@@ -2098,6 +2102,8 @@
             return( ret );
         }
 
+        ssl_hs_rm_dtls_hdr( ssl );
+
         if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
         {
             SSL_DEBUG_MSG( 1, ( "bad certificate request message" ) );
@@ -2222,6 +2228,8 @@
             return( ret );
         }
 
+        ssl_hs_rm_dtls_hdr( ssl );
+
         if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
         {
             SSL_DEBUG_MSG( 1, ( "bad server hello done message" ) );
@@ -2648,6 +2656,8 @@
         return( ret );
     }
 
+    ssl_hs_rm_dtls_hdr( ssl );
+
     if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
     {
         SSL_DEBUG_MSG( 1, ( "bad new session ticket message" ) );