diff --git a/host-bmc/host_pdr_handler.cpp b/host-bmc/host_pdr_handler.cpp
index 52b6206..f201965 100644
--- a/host-bmc/host_pdr_handler.cpp
+++ b/host-bmc/host_pdr_handler.cpp
@@ -733,12 +733,13 @@
 
                     uint8_t eventState;
                     uint8_t previousEventState;
-                    uint8_t sensorOffset = comp_sensor_count - 1;
 
-                    for (size_t i = 0; i < comp_sensor_count; i++)
+                    for (uint8_t sensorOffset = 0;
+                         sensorOffset < comp_sensor_count; sensorOffset++)
                     {
-                        eventState = stateField[i].present_state;
-                        previousEventState = stateField[i].previous_state;
+                        eventState = stateField[sensorOffset].present_state;
+                        previousEventState =
+                            stateField[sensorOffset].previous_state;
 
                         emitStateSensorEventSignal(tid, sensorId, sensorOffset,
                                                    eventState,