1 files changed, 5 insertions, 3 deletions
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
index b068dd4d27..40778374af 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
@@ -255,6 +255,10 @@ AcpiView (
   EfiConfigurationTable = NULL;
   OriginalAttribute = 0;
 
+  // Reset Table counts
+  mTableCount = 0;
+  mBinTableCount = 0;
+
   // Reset The error/warning counters
   ResetErrorCount ();
   ResetWarningCount ();
@@ -390,9 +394,7 @@ ShellCommandRunAcpiView (
   CONST CHAR16*      MandatoryTableSpecStr;
   CONST CHAR16       *SelectedTableName;
 
-  // Set Defaults
-  mTableCount = 0;
-  mBinTableCount = 0;
+  // Set configuration defaults
   AcpiConfigSetDefaults ();
 
   ShellStatus = SHELL_SUCCESS;