diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Einj/EinjParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Einj/EinjParser.c
index d01b15ff5f..5e5dc08fbc 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Einj/EinjParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Einj/EinjParser.c
@@ -327,7 +327,9 @@ ParseAcpiEinj (
              );
 
   // Validate Error Source Descriptors Count.
-  if ((mEinjInjectionHdrSize == NULL) || (*mEinjInjectionHdrSize != Offset)) {
+  if ((mEinjInjectionHdrSize == NULL) ||
+      (*mEinjInjectionHdrSize != (Offset - sizeof (EFI_ACPI_DESCRIPTION_HEADER))))
+  {
     IncrementErrorCount ();
     Print (L"ERROR: Invalid Injection Header...\n");
     return;