diff --git a/src/cpu/intel/common/common_init.c b/src/cpu/intel/common/common_init.c
index f189c598ac..fc5360d001 100644
--- a/src/cpu/intel/common/common_init.c
+++ b/src/cpu/intel/common/common_init.c
@@ -270,6 +270,9 @@ void set_aesni_lock(void)
 {
 	msr_t msr;
 
+	if (cpu_get_feature_flags_ecx() & CPUID_AES)
+		return;
+
 	/* Only run once per core as specified in the MSR datasheet */
 	if (intel_ht_sibling())
 		return;