diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
index 75c1addb09..386c31c921 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
@@ -140,7 +140,10 @@ Returns:
   CopyMem (&Record->ProducerName, ProducerName, sizeof (EFI_GUID));
   Record->DataRecordClass   = DataRecordClass;
 
-  Record->LogMonotonicCount = Private->GlobalMonotonicCount++;
+  //
+  // Ensure LogMonotonicCount is not zero
+  //
+  Record->LogMonotonicCount = ++Private->GlobalMonotonicCount;
 
   gRT->GetTime (&Record->LogTime, NULL);
 
@@ -258,8 +261,7 @@ Returns:
       if (FilterMonotonicCount != 0) {
         //
         // The GetNextMonotonicCount field remembers the last value from the previous time.
-        // But we already processed this vaule, so we need to find the next one. So if
-        // It is not the first time get the new record entry.
+        // But we already processed this vaule, so we need to find the next one.
         //
         *Record         = GetNextDataRecord (&Private->DataListHead, ClassFilter, &FilterMonotonicCount);
         *MonotonicCount = FilterMonotonicCount;
@@ -286,12 +288,10 @@ Returns:
     // If MonotonicCount is zero No more reacords left.
     //
     if (*MonotonicCount == 0) {
-      if (FilterMonotonicCount != 0) {
-        //
-        // Return the result of our extra GetNextDataRecord.
-        //
-        FilterDriver->GetNextMonotonicCount = FilterMonotonicCount;
-      }
+      //
+      // Save the current Record MonotonicCount.
+      //
+      FilterDriver->GetNextMonotonicCount = (*Record)->LogMonotonicCount;
     } else {
       //
       // Point to next undread record