diff --git a/src/more-infos/more-info-climate.html b/src/more-infos/more-info-climate.html
index a9a666b716..b3a079a3d6 100644
--- a/src/more-infos/more-info-climate.html
+++ b/src/more-infos/more-info-climate.html
@@ -241,16 +241,18 @@ Polymer({
   },
 
   computeTargetTempHidden: function (stateObj) {
-    return stateObj.attributes.operation_mode === 'off';
+    return !stateObj.attributes.temperature &&
+        !stateObj.attributes.target_temp_low &&
+        !stateObj.attributes.target_temp_high;
   },
 
   computeHideTempRangeSlider: function (stateObj) {
-    return stateObj.attributes.operation_mode !== 'auto';
+    return !stateObj.attributes.target_temp_low &&
+        !stateObj.attributes.target_temp_high;
   },
 
   computeHideTempSlider: function (stateObj) {
-    return stateObj.attributes.operation_mode === 'auto' ||
-        stateObj.attributes.operation_mode === 'off';
+    return !stateObj.attributes.temperature;
   },
 
   computeClassNames: function (stateObj) {
diff --git a/src/state-summary/state-card-climate.html b/src/state-summary/state-card-climate.html
index 946f4f5a7f..bdcedab1f4 100644
--- a/src/state-summary/state-card-climate.html
+++ b/src/state-summary/state-card-climate.html
@@ -72,13 +72,12 @@ Polymer({
   computeTargetTemperature: function (stateObj) {
     var stateTemp = '';
 
-    if (stateObj.attributes.operation_mode === 'off') {
-      stateTemp = '';
-    } else if (stateObj.attributes.operation_mode === 'auto') {
+    if (stateObj.attributes.target_temp_low &&
+        stateObj.attributes.target_temp_high) {
       stateTemp = stateObj.attributes.target_temp_low + ' - ' +
         stateObj.attributes.target_temp_high + ' ' +
         stateObj.attributes.unit_of_measurement;
-    } else {
+    } else if (stateObj.attributes.temperature) {
       stateTemp = stateObj.attributes.temperature + ' ' +
       stateObj.attributes.unit_of_measurement;
     }