diff --git a/sensorhandler.cpp b/sensorhandler.cpp
index dc0d85c..cd25da1 100644
--- a/sensorhandler.cpp
+++ b/sensorhandler.cpp
@@ -809,7 +809,12 @@
     auto it = sensorThresholdMap.find(sensorNum);
     if (it == sensorThresholdMap.end())
     {
-        sensorThresholdMap[sensorNum] = getSensorThresholds(ctx, sensorNum);
+        auto resp = getSensorThresholds(ctx, sensorNum);
+        if (resp.validMask == 0)
+        {
+            return ipmi::responseSensorInvalid();
+        }
+        sensorThresholdMap[sensorNum] = std::move(resp);
     }
 
     const auto& resp = sensorThresholdMap[sensorNum];