diff --git a/include/psa/crypto_struct.h b/include/psa/crypto_struct.h
index 87eefb9..3ccad24 100644
--- a/include/psa/crypto_struct.h
+++ b/include/psa/crypto_struct.h
@@ -144,7 +144,6 @@
 struct psa_cipher_operation_s
 {
     psa_algorithm_t alg;
-    unsigned int key_set : 1;
     unsigned int iv_required : 1;
     unsigned int iv_set : 1;
     unsigned int mbedtls_in_use : 1; /* Indicates mbed TLS is handling the operation. */
@@ -158,7 +157,7 @@
     } ctx;
 };
 
-#define PSA_CIPHER_OPERATION_INIT {0, 0, 0, 0, 0, 0, 0, {0}}
+#define PSA_CIPHER_OPERATION_INIT {0, 0, 0, 0, 0, 0, {0}}
 static inline struct psa_cipher_operation_s psa_cipher_operation_init( void )
 {
     const struct psa_cipher_operation_s v = PSA_CIPHER_OPERATION_INIT;
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 22dce5d..3dfee3b 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3408,7 +3408,6 @@
     /* Initialize the operation struct members, except for alg. The alg member
      * is used to indicate to psa_cipher_abort that there are resources to free,
      * so we only set it after resources have been allocated/initialized. */
-    operation->key_set = 0;
     operation->iv_set = 0;
     operation->mbedtls_in_use = 0;
     operation->iv_size = 0;
@@ -3444,12 +3443,7 @@
     }
 
 exit:
-    if( status == PSA_SUCCESS )
-    {
-        /* Update operation flags for both driver and software implementations */
-        operation->key_set = 1;
-    }
-    else
+    if( status != PSA_SUCCESS )
         psa_cipher_abort( operation );
 
     unlock_status = psa_unlock_key_slot( slot );
@@ -3607,7 +3601,6 @@
     psa_driver_wrapper_cipher_abort( operation );
 
     operation->alg = 0;
-    operation->key_set = 0;
     operation->iv_set = 0;
     operation->mbedtls_in_use = 0;
     operation->iv_size = 0;