diff --git a/src/Crypto/cpu.c b/src/Crypto/cpu.c
index a5b5bb19..401f524b 100644
--- a/src/Crypto/cpu.c
+++ b/src/Crypto/cpu.c
@@ -326,6 +326,7 @@ static BOOL CheckSHA256Support() {
 void DetectX86Features()
 {
 	uint32 cpuid[4] = {0}, cpuid1[4] = {0}, cpuid2[4] = {0};
+	int leaf7_avx2 = 0;
 	if (!CpuId(0, cpuid))
 		return;
 	if (!CpuId(1, cpuid1))
@@ -342,7 +343,7 @@ void DetectX86Features()
       uint64 xcrFeatureMask = xgetbv();
       g_hasAVX = (xcrFeatureMask & 0x6) == 0x6;
 	}
-	g_hasAVX2 = g_hasAVX && (cpuid1[1] & (1 << 5));
+	g_hasAVX2 = 0;
 	g_hasBMI2 = g_hasSSE2 && (cpuid1[1] & (1 << 8));
 	g_hasSSE42 = g_hasSSE2 && (cpuid1[2] & (1 << 20));
 	g_hasSSE41 = g_hasSSE2 && (cpuid1[2] & (1 << 19));
@@ -393,7 +394,7 @@ void DetectX86Features()
 			if (CpuId(7, cpuid2))
 			{
 				g_hasRDSEED = (cpuid2[1] & (1 << 18)) != 0;
-				g_hasAVX2 = (cpuid2[1] & (1 <<  5)) != 0;
+				leaf7_avx2 = (cpuid2[1] & (1 <<  5)) != 0;
 				g_hasBMI2 = (cpuid2[1] & (1 <<  8)) != 0;
 			}
 		}
@@ -410,11 +411,12 @@ void DetectX86Features()
 			if (CpuId(7, cpuid2))
 			{
 				g_hasRDSEED = (cpuid2[1] & (1 << 18)) != 0;
-				g_hasAVX2 = (cpuid2[1] & (1 <<  5)) != 0;
+				leaf7_avx2 = (cpuid2[1] & (1 <<  5)) != 0;
 				g_hasBMI2 = (cpuid2[1] & (1 <<  8)) != 0;
 			}
 		}
 	}
+	g_hasAVX2 = g_hasAVX && leaf7_avx2;
 #if defined(_MSC_VER) && !defined(_UEFI)
 	/* Add check fur buggy RDRAND (AMD Ryzen case) even if we always use RDSEED instead of RDRAND when RDSEED available */
 	if (g_hasRDRAND)
@@ -537,4 +539,4 @@ void DetectArmFeatures()
 	g_hasSHA256ARM = CPU_QuerySHA2();
 }
 
-#endif
\ No newline at end of file
+#endif