diff --git a/src/more-infos/more-info-thermostat.js b/src/more-infos/more-info-thermostat.js
index eb240fe452..f3ffd08907 100644
--- a/src/more-infos/more-info-thermostat.js
+++ b/src/more-infos/more-info-thermostat.js
@@ -32,7 +32,7 @@ export default new Polymer({
   },
 
   stateObjChanged(newVal) {
-    this.targetTemperatureSliderValue = newVal.state;
+    this.targetTemperatureSliderValue = newVal.attributes.temperature;
     this.awayToggleChecked = newVal.attributes.away_mode === 'on';
 
     this.tempMin = newVal.attributes.min_temp;
diff --git a/src/state-summary/state-card-thermostat.html b/src/state-summary/state-card-thermostat.html
index 71a43a1ae9..977d615792 100644
--- a/src/state-summary/state-card-thermostat.html
+++ b/src/state-summary/state-card-thermostat.html
@@ -26,7 +26,7 @@
     <div class='horizontal justified layout'>
       <state-info state-obj="[[stateObj]]"></state-info>
       <div class='state'>
-        <div class='target'>[[stateObj.stateDisplay]]</div>
+        <div class='target'>[[computeTargetTemperature(stateObj)]]</div>
 
         <div class='current'>
           <span>Currently: </span>
diff --git a/src/state-summary/state-card-thermostat.js b/src/state-summary/state-card-thermostat.js
index 405428326f..4b23b9c791 100644
--- a/src/state-summary/state-card-thermostat.js
+++ b/src/state-summary/state-card-thermostat.js
@@ -10,4 +10,8 @@ export default new Polymer({
       type: Object,
     },
   },
+
+  computeTargetTemperature(stateObj) {
+    return `${stateObj.attributes.temperature} ${stateObj.attributes.unit_of_measurement}`;
+  },
 });