diff --git a/host-bmc/host_pdr_handler.cpp b/host-bmc/host_pdr_handler.cpp
index 72f2478..ea55262 100644
--- a/host-bmc/host_pdr_handler.cpp
+++ b/host-bmc/host_pdr_handler.cpp
@@ -880,7 +880,8 @@
                             }
                         }
 
-                        if (sensorOffset > compositeSensorStates.size())
+                        if ((compositeSensorStates.size() > 1) &&
+                            (sensorOffset > (compositeSensorStates.size() - 1)))
                         {
                             error("Error Invalid data, Invalid sensor offset");
                             return;