diff --git a/config/nrfconnect/chip-module/Kconfig b/config/nrfconnect/chip-module/Kconfig
index 8cfd06d6ee..1c8adf40cb 100644
--- a/config/nrfconnect/chip-module/Kconfig
+++ b/config/nrfconnect/chip-module/Kconfig
@@ -512,15 +512,12 @@ choice CHIP_WIFI_CRYPTO_BACKEND
 
 config CHIP_WIFI_CRYPTO_BACKEND_PSA
 	bool "Matter WiFi PSA crypto backend"
+	imply SECURE_STORAGE if !BUILD_WITH_TFM
+	select CHIP_WIFI_CRYPTO_BACKEND_PSA_TRUSTED_STORAGE if TRUSTED_STORAGE
 	select PSA_WANT_ALG_ECDSA
 	select PSA_WANT_ALG_ECDH
 	select PSA_WANT_ECC_SECP_R1_256
 	select PSA_WANT_ALG_HKDF
-	select PSA_INTERNAL_TRUSTED_STORAGE
-	select MBEDTLS_PSA_CRYPTO_STORAGE_C if !BUILD_WITH_TFM
-	select TRUSTED_STORAGE if !BUILD_WITH_TFM
-	select HW_UNIQUE_KEY_WRITE_ON_CRYPTO_INIT if (SOC_NRF5340_CPUAPP || SOC_SERIES_NRF54L)
-	select MBEDTLS_PSA_CRYPTO_C
 	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
 	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
 	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
@@ -534,6 +531,12 @@ config CHIP_WIFI_CRYPTO_BACKEND_MBEDTLS
 
 endchoice
 
+config CHIP_WIFI_CRYPTO_BACKEND_PSA_TRUSTED_STORAGE
+	bool
+	depends on TRUSTED_STORAGE
+	select PSA_INTERNAL_TRUSTED_STORAGE
+	select HW_UNIQUE_KEY_WRITE_ON_CRYPTO_INIT if (SOC_NRF5340_CPUAPP || SOC_SERIES_NRF54L)
+
 config CHIP_IM_PRETTY_PRINT
 	bool "Detailed logging of Matter messages"
 	depends on !CHIP_LOG_SIZE_OPTIMIZATION