diff --git a/scripts/dump_entities.sh b/scripts/dump_entities.sh
index e0ba0ee30..e676ac4a2 100755
--- a/scripts/dump_entities.sh
+++ b/scripts/dump_entities.sh
@@ -4,6 +4,6 @@
 # run from top folder like `sh ./scripts/dump_entities.sh`
 rm -f dump_entities.csv
 make clean
-make ARGS=-DEMSESP_STANDALONE_DUMP
+make ARGS=-DEMSESP_STANDALONE
 echo "test entity_dump" | ./emsesp | python3 ./scripts/dump_entities.py > dump_entities.csv
 cat dump_entities.csv
\ No newline at end of file
diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index d9d28b474..04f2ec738 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -233,7 +233,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(const ui
             return heating_circuit;
         }
     }
-    LOG_DEBUG("Heating circuit not fond on device 0x%02X", device_id());
+
+    LOG_DEBUG("Heating circuit not found on device 0x%02X", device_id());
     return nullptr; // not found
 }
 
@@ -4224,9 +4225,11 @@ void Thermostat::register_device_values() {
         break;
     }
 
-#if defined(EMSESP_STANDALONE_DUMP)
+#if defined(EMSESP_STANDALONE)
     // if we're just dumping out values, create a single dummy hc
-    register_device_values_hc(std::make_shared<Thermostat::HeatingCircuit>(1, this->model())); // hc=1
+    auto new_hc = std::make_shared<Thermostat::HeatingCircuit>(1, this->model()); // hc = 1
+    heating_circuits_.push_back(new_hc);
+    register_device_values_hc(new_hc);
 #endif
 }