diff --git a/ChangeLog.d/ssl_tls13_prepare_new_session_ticket-psa_get_random.txt b/ChangeLog.d/ssl_tls13_prepare_new_session_ticket-psa_get_random.txt
new file mode 100644
index 0000000000..0fc8b0aa85
--- /dev/null
+++ b/ChangeLog.d/ssl_tls13_prepare_new_session_ticket-psa_get_random.txt
@@ -0,0 +1,5 @@
+Security
+   * Fix a bug where mbedtls_ssl_read() and mbedtls_ssl_write() could return
+     1 instead of an error code if the random generator fails if a server
+     calls these functions before the end of a TLS 1.3 handshake.
+     Reported by Mohammad Seet (mhdsait101). CVE-2026-40294
diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index dc7c776830..37fdf79ee3 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -3183,8 +3183,9 @@ static int ssl_tls13_prepare_new_session_ticket(mbedtls_ssl_context *ssl,
 #endif
 
     /* Generate ticket_age_add */
-    if ((ret = psa_generate_random((unsigned char *) &session->ticket_age_add,
-                                   sizeof(session->ticket_age_add)) != 0)) {
+    ret = psa_generate_random((unsigned char *) &session->ticket_age_add,
+                              sizeof(session->ticket_age_add));
+    if (ret != 0) {
         MBEDTLS_SSL_DEBUG_RET(1, "generate_ticket_age_add", ret);
         return ret;
     }