diff --git a/src/dialogs/more-info/controls/more-info-climate.ts b/src/dialogs/more-info/controls/more-info-climate.ts
index 7837536d14..bb1a4b2275 100644
--- a/src/dialogs/more-info/controls/more-info-climate.ts
+++ b/src/dialogs/more-info/controls/more-info-climate.ts
@@ -100,7 +100,8 @@ class MoreInfoClimate extends LitElement {
                   </div>
                 `
               : ""}
-            ${stateObj.attributes.temperature !== undefined
+            ${stateObj.attributes.temperature !== undefined &&
+            stateObj.attributes.temperature !== null
               ? html`
                   <ha-climate-control
                     .value=${stateObj.attributes.temperature}
@@ -112,8 +113,10 @@ class MoreInfoClimate extends LitElement {
                   ></ha-climate-control>
                 `
               : ""}
-            ${stateObj.attributes.target_temp_low !== undefined ||
-            stateObj.attributes.target_temp_high !== undefined
+            ${(stateObj.attributes.target_temp_low !== undefined &&
+              stateObj.attributes.target_temp_low !== null) ||
+            (stateObj.attributes.target_temp_high !== undefined &&
+              stateObj.attributes.target_temp_high !== null)
               ? html`
                   <ha-climate-control
                     .value=${stateObj.attributes.target_temp_low}