diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 352756dc8..2b9eca8f2 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -7049,13 +7049,8 @@ static psa_status_t psa_key_agreement_internal(psa_key_derivation_operation_t *o
                                                size_t peer_key_length)
 {
     psa_status_t status;
-#if PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE != 0
     uint8_t shared_secret[PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE];
-    size_t shared_secret_length = sizeof(shared_secret);
-#else
-    uint8_t *shared_secret = NULL;
     size_t shared_secret_length = 0;
-#endif
     psa_algorithm_t ka_alg = PSA_ALG_KEY_AGREEMENT_GET_BASE(operation->alg);
 
     /* Step 1: run the secret agreement algorithm to generate the shared
@@ -7064,7 +7059,7 @@ static psa_status_t psa_key_agreement_internal(psa_key_derivation_operation_t *o
                                             private_key,
                                             peer_key, peer_key_length,
                                             shared_secret,
-                                            shared_secret_length,
+                                            sizeof(shared_secret),
                                             &shared_secret_length);
     if (status != PSA_SUCCESS) {
         goto exit;