diff --git a/include/ChassisIntrusionSensor.hpp b/include/ChassisIntrusionSensor.hpp
index fe04fc9..4bc421a 100644
--- a/include/ChassisIntrusionSensor.hpp
+++ b/include/ChassisIntrusionSensor.hpp
@@ -42,7 +42,6 @@
     int mFd;
 
     // common members
-    std::string mOverriddenValue = "unknown";
     bool mOverridenState = false;
     bool mInternalSet = false;
 
diff --git a/include/sensor.hpp b/include/sensor.hpp
index 607eb3d..2a414da 100644
--- a/include/sensor.hpp
+++ b/include/sensor.hpp
@@ -30,20 +30,20 @@
     std::shared_ptr<sdbusplus::asio::dbus_interface> thresholdInterfaceCritical;
     std::shared_ptr<sdbusplus::asio::dbus_interface> association;
     double value = std::numeric_limits<double>::quiet_NaN();
-    double overriddenValue = std::numeric_limits<double>::quiet_NaN();
     bool overridenState = false;
     bool internalSet = false;
 
     int setSensorValue(const double& newValue, double& oldValue)
     {
-        if (internalSet)
+        if (!internalSet)
         {
-            internalSet = false;
             oldValue = newValue;
-            return 1;
+            overridenState = true;
         }
-        overriddenValue = newValue;
-        overridenState = true;
+        else if (!overridenState)
+        {
+            oldValue = newValue;
+        }
         return 1;
     }