diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
index 5efc28fe20..4e94f13103 100644
--- a/config/nrfconnect/chip-module/Kconfig.defaults
+++ b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -266,6 +266,10 @@ endif # CHIP_WIFI
 # Crypto configuration
 # ==============================================================================
 
+# TODO Remove after testing:
+config CHIP_CRYPTO_PSA
+    default y
+
 choice OPENTHREAD_SECURITY
     default OPENTHREAD_NRF_SECURITY_PSA_CHOICE if CHIP_CRYPTO_PSA
     default OPENTHREAD_NRF_SECURITY_CHOICE