diff --git a/doc/releases/release-notes-2.6.rst b/doc/releases/release-notes-2.6.rst
index e74ff52fa2b..63e0e89f55e 100644
--- a/doc/releases/release-notes-2.6.rst
+++ b/doc/releases/release-notes-2.6.rst
@@ -654,6 +654,11 @@ Trusted Firmware-m
    * BL5340 DVK
    * STM32L562E DK
 
+* NOTE: Trusted-Firmware-M can not currently be used with mbedtls 2.26.0 when
+  PSA APIs are enabled in mbedtls (``MBEDTLS_USE_PSA_CRYPTO`` and
+  ``MBEDTLS_PSA_CRYPTO_C``). If both TF-M and mbedtls are required, mbedtls
+  must be used without the PSA APIs. This will be resolved in a future
+  update to mbedtls.
 
 Documentation
 *************