diff --git a/occ_manager.cpp b/occ_manager.cpp
index 72d7ada..75d7b1f 100644
--- a/occ_manager.cpp
+++ b/occ_manager.cpp
@@ -165,8 +165,7 @@
     allActiveSensorAvailable = true;
     for (auto& obj : statusObjects)
     {
-        // If active sensor is already true, then no need to query sensor
-        if (!obj->occActive())
+        if (!obj->getPldmSensorReceived())
         {
             auto instance = obj->getOccInstanceID();
             // Check if sensor was queued while waiting for discovery
@@ -462,6 +461,7 @@
 
     if (obj != statusObjects.end())
     {
+        (*obj)->setPldmSensorReceived(true);
         return (*obj)->occActive(status);
     }
     else