diff --git a/libpldmresponder/event_parser.hpp b/libpldmresponder/event_parser.hpp
index 4d95e3a..7498c4c 100644
--- a/libpldmresponder/event_parser.hpp
+++ b/libpldmresponder/event_parser.hpp
@@ -27,13 +27,14 @@
     pdr::EntityType entityType;
     pdr::EntityInstance entityInstance;
     pdr::SensorOffset sensorOffset;
+    pdr::StateSetId stateSetid;
 
     bool operator==(const StateSensorEntry& e) const
     {
-        return ((containerId == e.containerId) &&
-                (entityType == e.entityType) &&
-                (entityInstance == e.entityInstance) &&
-                (sensorOffset == e.sensorOffset));
+        return (
+            (containerId == e.containerId) && (entityType == e.entityType) &&
+            (entityInstance == e.entityInstance) &&
+            (sensorOffset == e.sensorOffset) && (stateSetid == e.stateSetid));
     }
 
     bool operator<(const StateSensorEntry& e) const
@@ -45,7 +46,10 @@
              (entityInstance < e.entityInstance)) ||
             ((containerId == e.containerId) && (entityType == e.entityType) &&
              (entityInstance == e.entityInstance) &&
-             (sensorOffset < e.sensorOffset)));
+             (sensorOffset < e.sensorOffset)) ||
+            ((containerId == e.containerId) && (entityType == e.entityType) &&
+             (entityInstance == e.entityInstance) &&
+             (sensorOffset == e.sensorOffset) && (stateSetid < e.stateSetid)));
     }
 };