diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 5ad9f23df8..00eef4c97e 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5881,7 +5881,9 @@ exit:
         psa_algorithm_t alg = operation->alg;
         psa_key_derivation_abort(operation);
         operation->alg = alg;
-        memset(output, '!', output_length);
+        if (output != NULL) {
+            memset(output, '!', output_length);
+        }
     }
 
     LOCAL_OUTPUT_FREE(output_external, output);