diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp
index 59c954b..930eb52 100644
--- a/redfish-core/lib/sensors.hpp
+++ b/redfish-core/lib/sensors.hpp
@@ -39,6 +39,7 @@
 #include <array>
 #include <cmath>
 #include <iterator>
+#include <limits>
 #include <map>
 #include <set>
 #include <string_view>
@@ -930,6 +931,19 @@
                 BMCWEB_LOG_ERROR << "Got value interface that wasn't double";
                 continue;
             }
+            if (!std::isfinite(*doubleValue))
+            {
+                if (valueName == "Value")
+                {
+                    // Readings are allowed to be NAN for unavailable;  coerce
+                    // them to null in the json response.
+                    sensorJson[key] = nullptr;
+                    continue;
+                }
+                BMCWEB_LOG_WARNING << "Sensor value for " << valueName
+                                   << " was unexpectedly " << *doubleValue;
+                continue;
+            }
             if (forceToInt)
             {
                 sensorJson[key] = static_cast<int64_t>(*doubleValue);