diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
index d27c5efea5e..680cb24d018 100644
--- a/modules/mbedtls/Kconfig.tls-generic
+++ b/modules/mbedtls/Kconfig.tls-generic
@@ -422,6 +422,7 @@ config MBEDTLS_SERVER_NAME_INDICATION
 
 config MBEDTLS_PK_WRITE_C
 	bool "The generic public (asymmetric) key writer"
+	default y if MBEDTLS_PSA_CRYPTO_C
 	help
 	  Enable generic public key write functions.
 
diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h
index 839f9e02724..0c6d418c476 100644
--- a/modules/mbedtls/configs/config-tls-generic.h
+++ b/modules/mbedtls/configs/config-tls-generic.h
@@ -394,15 +394,6 @@
 #define MBEDTLS_X509_USE_C
 #endif
 
-#if defined(MBEDTLS_X509_USE_C) || \
-    defined(MBEDTLS_ECDSA_C)
-#define MBEDTLS_ASN1_PARSE_C
-#endif
-
-#if defined(MBEDTLS_ECDSA_C)
-#define MBEDTLS_ASN1_WRITE_C
-#endif
-
 #if defined(MBEDTLS_DHM_C) || \
     defined(MBEDTLS_ECP_C) || \
     defined(MBEDTLS_RSA_C) || \
@@ -428,6 +419,14 @@
 #define MBEDTLS_PK_C
 #endif
 
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_ECDSA_C)
+#define MBEDTLS_ASN1_PARSE_C
+#endif
+
+#if defined(MBEDTLS_ECDSA_C) || defined(MBEDTLS_PK_WRITE_C)
+#define MBEDTLS_ASN1_WRITE_C
+#endif
+
 #if defined(CONFIG_MBEDTLS_PKCS5_C)
 #define MBEDTLS_PKCS5_C
 #endif