diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 418c84d06..4c07a64bb 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -2185,6 +2185,10 @@ static int ssl_tls13_write_end_of_early_data(mbedtls_ssl_context *ssl)
 
         MBEDTLS_SSL_PROC_CHK(
             mbedtls_ssl_finish_handshake_msg(ssl, buf_len, 0));
+
+        /* Switch outbound back to handshake key after end_of_early_data */
+        mbedtls_ssl_set_outbound_transform(
+            ssl, ssl->handshake->transform_handshake);
     }
 
     MBEDTLS_SSL_PROC_CHK(