diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 72ecdde21..733a2e46c 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3149,6 +3149,8 @@ psa_status_t psa_mac_verify_finish( psa_mac_operation_t *operation,
 
     status = psa_mac_finish_internal( operation,
                                       actual_mac, sizeof( actual_mac ) );
+    if( status != PSA_SUCCESS )
+        goto cleanup;
 
     if( safer_memcmp( mac, actual_mac, mac_length ) != 0 )
         status = PSA_ERROR_INVALID_SIGNATURE;