diff --git a/src/sensorcommands.cpp b/src/sensorcommands.cpp
index 811cd91..a226cb9 100644
--- a/src/sensorcommands.cpp
+++ b/src/sensorcommands.cpp
@@ -433,6 +433,31 @@
         static_cast<uint8_t>(IPMISensorReadingByte2::sensorScanningEnable);
     operation |=
         static_cast<uint8_t>(IPMISensorReadingByte2::eventMessagesEnable);
+    bool notReading = std::isnan(reading);
+
+    if (!notReading)
+    {
+        auto availableObject =
+            sensorMap.find("xyz.openbmc_project.State.Decorator.Availability");
+        if (availableObject != sensorMap.end())
+        {
+            auto findAvailable = availableObject->second.find("Available");
+            if (findAvailable != availableObject->second.end())
+            {
+                bool* available = std::get_if<bool>(&(findAvailable->second));
+                if (available && !(*available))
+                {
+                    notReading = true;
+                }
+            }
+        }
+    }
+
+    if (notReading)
+    {
+        operation |= static_cast<uint8_t>(
+            IPMISensorReadingByte2::readingStateUnavailable);
+    }
 
     uint8_t thresholds = 0;