diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index e16c028..278027a 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6083,7 +6083,7 @@
     if( ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM )
     {
         /* Remember offset of next record within datagram. */
-        ssl->next_record_offset = ssl->in_msglen + mbedtls_ssl_in_hdr_len( ssl );
+        ssl->next_record_offset = rec.buf_len;
         if( ssl->next_record_offset < ssl->in_left )
         {
             MBEDTLS_SSL_DEBUG_MSG( 3, ( "more than one record within datagram" ) );