diff --git a/wolfcrypt/src/aes_asm.asm b/wolfcrypt/src/aes_asm.asm
index 6fe026d5c..cd7bc78a1 100644
--- a/wolfcrypt/src/aes_asm.asm
+++ b/wolfcrypt/src/aes_asm.asm
@@ -100,6 +100,7 @@ LAST:
 	ret
 AES_CBC_encrypt ENDP
 
+IFDEF WOLFSSL_AESNI_BY4
 
 ; void AES_CBC_decrypt_by4(const unsigned char* in,
 ;                          unsigned char* out,
@@ -308,6 +309,8 @@ DEND_4:
         ret
 AES_CBC_decrypt_by4 ENDP
 
+ELSE
+IFDEF WOLFSSL_AESNI_BY6
 
 ; void AES_CBC_decrypt_by6(const unsigned char *in,
 ;                          unsigned char *out,
@@ -565,6 +568,7 @@ DEND_6:
         ret
 AES_CBC_decrypt_by6 ENDP
 
+ELSE
 
 ; void AES_CBC_decrypt_by8(const unsigned char *in,
 ;                          unsigned char *out,
@@ -848,6 +852,8 @@ DEND_8:
         ret
 AES_CBC_decrypt_by8 ENDP
 
+ENDIF
+ENDIF
 
 ;	/*
 ;	AES_ECB_encrypt[const	,unsigned	char*in