diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c
index 490e666c5..1233bd416 100644
--- a/wolfcrypt/src/evp.c
+++ b/wolfcrypt/src/evp.c
@@ -5683,7 +5683,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
 
 #if defined(HAVE_AES_CBC) || defined(WOLFSSL_AES_COUNTER) || \
     defined(HAVE_AES_ECB) || defined(WOLFSSL_AES_CFB) || \
-    defined(WOLFSSL_AES_OFB)
+    defined(WOLFSSL_AES_OFB) || defined(WOLFSSL_AES_DIRECT)
     #define AES_SET_KEY
 #endif
 
diff --git a/wolfcrypt/src/wc_encrypt.c b/wolfcrypt/src/wc_encrypt.c
index 6eabb5eb4..03ff8519c 100644
--- a/wolfcrypt/src/wc_encrypt.c
+++ b/wolfcrypt/src/wc_encrypt.c
@@ -688,7 +688,10 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
         }
     }
 
-    if (key != NULL) {
+#ifdef WOLFSSL_SMALL_STACK
+    if (key != NULL)
+#endif
+    {
         ForceZero(key, PKCS_MAX_KEY_SIZE);
     #ifdef WOLFSSL_SMALL_STACK
         XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);