diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
index ecc4e142ac..676aedef6e 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
@@ -363,7 +363,7 @@ SmbiosPrintStructure (
       PRINT_STRUCT_VALUE (Struct, Type4, ThreadCount);
       DisplayProcessorCharacteristics (Struct->Type4->ProcessorCharacteristics, Option);
     }
-    if (AE_SMBIOS_VERSION (0x3, 0x0) && (Struct->Hdr->Length > 0x2A)) {
+    if ((SmbiosMajorVersion >= 0x3) && (Struct->Hdr->Length > 0x2A)) {
       PRINT_STRUCT_VALUE (Struct, Type4, CoreCount2);
       PRINT_STRUCT_VALUE (Struct, Type4, EnabledCoreCount2);
       PRINT_STRUCT_VALUE (Struct, Type4, ThreadCount2);