diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
index a0d144d34..d7051f760 100644
--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@@ -2851,14 +2851,7 @@ static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock)
 
         ret = wc_AesSetIV(aes, iv);
 
-    #if defined(WOLFSSL_DEVCRYPTO) && \
-        (defined(WOLFSSL_DEVCRYPTO_AES) || defined(WOLFSSL_DEVCRYPTO_CBC))
-        aes->ctx.cfd = -1;
-    #endif
-    #ifdef WOLFSSL_IMX6_CAAM_BLOB
-        ForceZero(local, sizeof(local));
-    #endif
-        return ret;
+        return wc_AesSetKeyLocal(aes, userKey, keylen, iv, dir);
     }
 
     int wc_AesSetKey(Aes* aes, const byte* userKey, word32 keylen,