1 files changed, 12 insertions, 0 deletions
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/Performance.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/Performance.c
index 6bb60c1500..8f152a8e26 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/Performance.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/Performance.c
@@ -263,6 +263,12 @@ WriteBootToOsPerformanceData (
       }
       EntryIndex++;
       if ((Handle == Handles[Index]) && (EndTicker != 0)) {
+        if (StartTicker == 1) {
+          StartTicker = StartValue;
+        }
+        if (EndTicker == 1) {
+          EndTicker = StartValue;
+        }
         Ticker += CountUp ? (EndTicker - StartTicker) : (StartTicker - EndTicker);
       }
     }
@@ -303,6 +309,12 @@ WriteBootToOsPerformanceData (
       ZeroMem (&mPerfData, sizeof (PERF_DATA));
 
       AsciiStrnCpy (mPerfData.Token, Token, PERF_TOKEN_LENGTH);
+      if (StartTicker == 1) {
+        StartTicker = StartValue;
+      }
+      if (EndTicker == 1) {
+        EndTicker = StartValue;
+      }
       Ticker = CountUp ? (EndTicker - StartTicker) : (StartTicker - EndTicker);
 
       mPerfData.Duration = (UINT32) DivU64x32 (Ticker, (UINT32) Freq);