1 files changed, 13 insertions, 10 deletions
diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
index b58de9db6f..a2e991a288 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
@@ -243,19 +243,22 @@ DataHubGetNextRecord (
       // Use the MTC from the Filter Driver.
       //
       FilterMonotonicCount = FilterDriver->GetNextMonotonicCount;
+       
+      //
+      // 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.
+      //
+      *Record = GetNextDataRecord (&Private->DataListHead, ClassFilter, &FilterMonotonicCount);
       if (FilterMonotonicCount != 0) {
+        *MonotonicCount = FilterMonotonicCount;
+      }
+      
+      if ((FilterDriver->GetNextMonotonicCount != 0) && (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.
+        // If there is no new record to get exit now.
         //
-        *Record         = GetNextDataRecord (&Private->DataListHead, ClassFilter, &FilterMonotonicCount);
-        *MonotonicCount = FilterMonotonicCount;
-        if (FilterMonotonicCount == 0) {
-          //
-          // If there is no new record to get exit now.
-          //
-          return EFI_NOT_FOUND;
-        }
+        *MonotonicCount = 0;
+        return EFI_NOT_FOUND;
       }
     }
   }