diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index a33d582..73dc2e2 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -8378,6 +8378,11 @@
             return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
     }
 
+#if defined(MBEDTLS_SSL_CID)
+    if( transform->out_cid_len != 0 )
+        transform_expansion += MBEDTLS_SSL_MAX_CID_EXPANSION;
+#endif /* MBEDTLS_SSL_CID */
+
     return( (int)( out_hdr_len + transform_expansion ) );
 }