diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/Cpuid/Cpuid.c
index 8726a85f4e..ac14c41ed6 100644
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.c
+++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c
@@ -617,8 +617,7 @@ CpuidStructuredExtendedFeatureFlags (
       PRINT_BIT_FIELD (Ecx, PKU);
       PRINT_BIT_FIELD (Ecx, OSPKE);
     }
-    SubLeaf++;
-  } while (SubLeaf <= Eax);
+  }
 }
 
 /**
diff --git a/UefiCpuPkg/Include/Register/Cpuid.h b/UefiCpuPkg/Include/Register/Cpuid.h
index eb24840746..864108da62 100644
--- a/UefiCpuPkg/Include/Register/Cpuid.h
+++ b/UefiCpuPkg/Include/Register/Cpuid.h
@@ -1275,8 +1275,7 @@ typedef union {
       SubLeaf,
       NULL, &Ebx.Uint32, &Ecx.Uint32, NULL
       );
-    SubLeaf++;
-  } while (SubLeaf <= Eax);
+  }
   @endcode
 **/
 #define CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS                0x07