diff --git a/include/mbedtls/block_cipher.h b/include/mbedtls/block_cipher.h
index d76d860..535412a 100644
--- a/include/mbedtls/block_cipher.h
+++ b/include/mbedtls/block_cipher.h
@@ -25,7 +25,7 @@
 #endif
 
 #if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA)
-#include "psa/crypto.h"
+#include "psa/crypto_types.h"
 #endif
 
 #ifdef __cplusplus
@@ -53,7 +53,6 @@
     mbedtls_block_cipher_id_t MBEDTLS_PRIVATE(id);
 #if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA)
     mbedtls_block_cipher_engine_t engine;
-    psa_cipher_operation_t psa_operation;
     psa_key_type_t psa_key_type;
     mbedtls_svc_key_id_t psa_key_id;
 #endif
diff --git a/library/block_cipher.c b/library/block_cipher.c
index 0fd78ab..fb09374 100644
--- a/library/block_cipher.c
+++ b/library/block_cipher.c
@@ -12,8 +12,8 @@
 #include "common.h"
 
 #if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA)
-#include "psa_crypto_core.h"
 #include "psa/crypto.h"
+#include "psa_crypto_core.h"
 #include "psa_util_internal.h"
 #endif
 
@@ -53,7 +53,6 @@
 {
 #if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA)
     if (ctx->engine == MBEDTLS_BLOCK_CIPHER_ENGINE_PSA) {
-        psa_cipher_abort(&ctx->psa_operation);
         psa_destroy_key(ctx->psa_key_id);
         return;
     }
@@ -138,12 +137,6 @@
         }
         psa_reset_key_attributes(&key_attr);
 
-        status = psa_cipher_encrypt_setup(&ctx->psa_operation, ctx->psa_key_id,
-                                          PSA_ALG_ECB_NO_PADDING);
-        if (status != PSA_SUCCESS) {
-            return mbedtls_cipher_error_from_psa(status);
-        }
-
         return 0;
     }
 #endif /* MBEDTLS_BLOCK_CIPHER_SOME_PSA */