diff --git a/sensorhandler.cpp b/sensorhandler.cpp
index 8a0d23c..40c0d3e 100644
--- a/sensorhandler.cpp
+++ b/sensorhandler.cpp
@@ -827,6 +827,11 @@
         record.body.sensor_type = sensor->second.sensorType;
         record.body.event_reading_type = sensor->second.sensorReadingType;
         record.body.entity_instance = sensor->second.instance;
+        if (ipmi::sensor::Mutability::Write ==
+            (sensor->second.mutability & ipmi::sensor::Mutability::Write))
+        {
+            get_sdr::body::init_settable_state(true, &(record.body));
+        }
 
         // Set the type-specific details given the DBus interface
         ret = populate_record_from_dbus(&(record.body), &(sensor->second),
