diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index 9515f05ed..a12b52a85 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -505,6 +505,7 @@ extern "C" {
 #endif
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
+#define MBEDTLS_PSA_BUILTIN_ALG_CBC_NO_PADDING 1
 #define PSA_WANT_ALG_CBC_NO_PADDING 1
 #if defined(MBEDTLS_CIPHER_PADDING_PKCS7)
 #define MBEDTLS_PSA_BUILTIN_ALG_CBC_PKCS7 1
@@ -515,6 +516,7 @@ extern "C" {
 #if defined(MBEDTLS_AES_C) || defined(MBEDTLS_DES_C) || \
     defined(MBEDTLS_CAMELLIA_C)
 #define MBEDTLS_PSA_BUILTIN_ALG_ECB 1
+#define MBEDTLS_PSA_BUILTIN_ALG_ECB_NO_PADDING 1
 #define PSA_WANT_ALG_ECB_NO_PADDING 1
 #endif