diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 4daf2e7..02e828e 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1100,6 +1100,9 @@
     /* Initialize structures */
     mbedtls_ssl_session_init(ssl->session_negotiate);
     ssl_handshake_params_init(ssl->handshake);
+#if defined(MBEDTLS_SSL_EARLY_DATA) && defined(MBEDTLS_SSL_SRV_C)
+    ssl->session_negotiate->max_early_data_size = ssl->conf->max_early_data_size;
+#endif
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_2)
     mbedtls_ssl_transform_init(ssl->transform_negotiate);
diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index df10cc6..c04b8bd 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -564,6 +564,9 @@
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
         mbedtls_ssl_session session;
         mbedtls_ssl_session_init(&session);
+#if defined(MBEDTLS_SSL_EARLY_DATA)
+        session.max_early_data_size = ssl->conf->max_early_data_size;
+#endif
 #endif
 
         MBEDTLS_SSL_CHK_BUF_READ_PTR(p_identity_len, identities_end, 2 + 1 + 4);