diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index b0c19e565..e17905db3 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -1046,8 +1046,8 @@ extern "C" {
 #if defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_USE) && \
     defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT) && \
     defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT) && \
-    defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE)
-//defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE) /* Not supported yet */
+    defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE) && \
+    defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE)
 #define MBEDTLS_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_LEGACY
 #endif