diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 6c7f2b0ece..46b957874c 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5890,6 +5890,11 @@ static int is_kdf_alg_supported(psa_algorithm_t kdf_alg)
     if (kdf_alg == PSA_ALG_TLS12_ECJPAKE_TO_PMS) {
         return 1;
     }
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC)
+    if (PSA_ALG_IS_PBKDF2_HMAC(kdf_alg)) {
+        return 1;
+    }
 #endif
     return 0;
 }