diff --git a/esphome/nspanel_esphome_addon_climate_base.yaml b/esphome/nspanel_esphome_addon_climate_base.yaml
index fb21ab5db..052811682 100644
--- a/esphome/nspanel_esphome_addon_climate_base.yaml
+++ b/esphome/nspanel_esphome_addon_climate_base.yaml
@@ -265,6 +265,14 @@ script:
           if (current_page->state == "climate")
             id(is_addon_climate_visible) = embedded_climate;
 
+  - id: !extend set_var_bool
+    then:
+      - lambda: |-
+          if (component == "is_embedded_thermostat") {
+            id(is_embedded_thermostat) = val;
+            boot_progress->execute(${BOOT_STEP_BASE}, "Base");
+          }
+
   - id: !extend set_var_string
     then:
       - lambda: |-
diff --git a/esphome/nspanel_esphome_core_base.yaml b/esphome/nspanel_esphome_core_base.yaml
index 9187cf2ba..4d6393978 100644
--- a/esphome/nspanel_esphome_core_base.yaml
+++ b/esphome/nspanel_esphome_core_base.yaml
@@ -266,12 +266,7 @@ script:
     parameters:
       component: string
       val: bool
-    then:
-      - lambda: |-
-          if (component == "is_embedded_thermostat") {
-            id(is_embedded_thermostat) = val;
-            boot_progress->execute(${BOOT_STEP_BASE}, "Base");
-          }
+    then:  # There's nothing here so far
 
   - id: set_var_int
     mode: queued