diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 43fa449a2..7e7d5a0b4 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -8082,6 +8082,9 @@ static void ssl_update_out_pointers( mbedtls_ssl_context *ssl,
     {
         ssl->out_ctr = ssl->out_hdr - 8;
         ssl->out_len = ssl->out_hdr + 3;
+#if defined(MBEDTLS_SSL_CID)
+        ssl->out_cid = ssl->out_len;
+#endif
         ssl->out_iv  = ssl->out_hdr + 5;
     }
 
@@ -8136,6 +8139,9 @@ static void ssl_update_in_pointers( mbedtls_ssl_context *ssl )
     {
         ssl->in_ctr = ssl->in_hdr - 8;
         ssl->in_len = ssl->in_hdr + 3;
+#if defined(MBEDTLS_SSL_CID)
+        ssl->in_cid = ssl->in_len;
+#endif
         ssl->in_iv  = ssl->in_hdr + 5;
     }