diff --git a/include/sensor.hpp b/include/sensor.hpp
index 982365a..973362b 100644
--- a/include/sensor.hpp
+++ b/include/sensor.hpp
@@ -278,13 +278,11 @@
         if (!readingStateGood())
         {
             markAvailable(false);
+            updateValueProperty(std::numeric_limits<double>::quiet_NaN());
             return;
         }
 
-        // Indicate that it is internal set call
-        internalSet = true;
-        updateProperty(sensorInterface, value, newValue, "Value");
-        internalSet = false;
+        updateValueProperty(newValue);
 
         // Always check thresholds after changing the value,
         // as the test against hysteresisTrigger now takes place in
@@ -327,4 +325,13 @@
         }
         return false;
     }
+
+  private:
+    void updateValueProperty(const double& newValue)
+    {
+        // Indicate that it is internal set call, not an external overwrite
+        internalSet = true;
+        updateProperty(sensorInterface, value, newValue, "Value");
+        internalSet = false;
+    }
 };