diff --git a/include/psa/crypto.h b/include/psa/crypto.h
index e8bea076d..e8b22e0f5 100644
--- a/include/psa/crypto.h
+++ b/include/psa/crypto.h
@@ -89,8 +89,6 @@ typedef enum {
     PSA_ERROR_INVALID_SIGNATURE,
     /** The decrypted padding is incorrect. */
     PSA_ERROR_INVALID_PADDING,
-    /** The key policy is incorrect. */
-    PSA_ERROR_INVALID_KEY_POLICY,
     /** An error occurred that does not correspond to any defined
         failure cause. */
     PSA_ERROR_UNKNOWN_ERROR,
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 2391006f0..c516e38af 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1330,7 +1330,7 @@ psa_status_t psa_set_key_policy(psa_key_slot_t key,
     if( ( policy->usage & ~( PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_ENCRYPT 
                         | PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_SIGN 
                         | PSA_KEY_USAGE_VERIFY ) ) != 0 )
-        return( PSA_ERROR_INVALID_KEY_POLICY );
+        return( PSA_ERROR_INVALID_ARGUMENT );
 
     slot->policy = *policy;