diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h
index a6527f8166f..b852e42818f 100644
--- a/modules/mbedtls/configs/config-tls-generic.h
+++ b/modules/mbedtls/configs/config-tls-generic.h
@@ -495,4 +495,9 @@
 #include CONFIG_MBEDTLS_USER_CONFIG_FILE
 #endif
 
+#if defined(CONFIG_BUILD_WITH_TFM)
+#define MBEDTLS_PSA_CRYPTO_CLIENT
+#undef MBEDTLS_PSA_CRYPTO_C
+#endif /* CONFIG_BUILD_WITH_TFM */
+
 #endif /* MBEDTLS_CONFIG_H */