diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index b939510..0e8ce65 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -774,7 +774,7 @@
         int dynamic_iv_is_explicit =
             ssl_transform_aead_dynamic_iv_is_explicit( transform );
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-        psa_status_t status;
+        psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 #else
         int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
@@ -892,7 +892,7 @@
         size_t padlen, i;
         size_t olen;
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-        psa_status_t status;
+        psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
         size_t part_len;
         psa_cipher_operation_t cipher_op = PSA_CIPHER_OPERATION_INIT;
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
@@ -1178,7 +1178,7 @@
         unsigned char *dynamic_iv;
         size_t dynamic_iv_len;
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-        psa_status_t status;
+        psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
 
         /*
@@ -1302,7 +1302,7 @@
     {
         size_t minlen = 0;
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-        psa_status_t status;
+        psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
         size_t part_len;
         psa_cipher_operation_t cipher_op = PSA_CIPHER_OPERATION_INIT;
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 0c92a05..1e9cb2d 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -722,7 +722,7 @@
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_algorithm_t alg;
     size_t key_bits;
-    psa_status_t status;
+    psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 #endif
 
 #if !defined(MBEDTLS_DEBUG_C) && \
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 0351db0..00a9f8c 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -1192,7 +1192,7 @@
                     const unsigned char *input, size_t ilen,
                     unsigned char *output, size_t *olen )
 {
-    psa_status_t status;
+    psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
     psa_cipher_operation_t cipher_op = PSA_CIPHER_OPERATION_INIT;
     size_t part_len;
 
@@ -1239,7 +1239,7 @@
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_algorithm_t alg;
     size_t key_bits;
-    psa_status_t status;
+    psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 #endif
 
     size_t keylen, maclen, ivlen;