diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index c5783afd2..ece522832 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -928,15 +928,15 @@ void Thermostat::process_RC10Set(std::shared_ptr<const Telegram> telegram) {
 // type 0x0165, ff
 void Thermostat::process_JunkersSet(std::shared_ptr<const Telegram> telegram) {
     std::shared_ptr<Thermostat::HeatingCircuit> hc = heating_circuit(telegram);
-    telegram->read_value(hc->daytemp, 17);   // is * 2
-    telegram->read_value(hc->nighttemp, 16); // is * 2
+    telegram->read_value(hc->daytemp, 17);     // is * 2
+    telegram->read_value(hc->nighttemp, 16);   // is * 2
     telegram->read_value(hc->nofrosttemp, 15); // is * 2
 }
 // type 0x0179, ff
 void Thermostat::process_JunkersSet2(std::shared_ptr<const Telegram> telegram) {
     std::shared_ptr<Thermostat::HeatingCircuit> hc = heating_circuit(telegram);
-    telegram->read_value(hc->daytemp, 7);   // is * 2
-    telegram->read_value(hc->nighttemp, 6); // is * 2
+    telegram->read_value(hc->daytemp, 7);     // is * 2
+    telegram->read_value(hc->nighttemp, 6);   // is * 2
     telegram->read_value(hc->nofrosttemp, 5); // is * 2
 }
 
@@ -1143,14 +1143,9 @@ void Thermostat::console_commands(Shell & shell, unsigned int context) {
     EMSESPShell::commands->add_command(ShellContext::THERMOSTAT,
                                        CommandFlags::ADMIN,
                                        flash_string_vector{F_(set), F_(master)},
-                                       flash_string_vector{F_(deviceid_optional)},
+                                       flash_string_vector{F_(deviceid_mandatory)},
                                        [](Shell & shell, const std::vector<std::string> & arguments) {
-                                           uint8_t value;
-                                           if (arguments.empty()) {
-                                               value = EMSESP_DEFAULT_MASTER_THERMOSTAT;
-                                           } else {
-                                               value = Helpers::hextoint(arguments.front().c_str());
-                                           }
+                                           uint8_t value = Helpers::hextoint(arguments.front().c_str());
 
                                            EMSESP::emsespSettingsService.update(
                                                [&](EMSESPSettings & settings) {
diff --git a/src/locale_EN.h b/src/locale_EN.h
index 57f74f86c..548c21d76 100644
--- a/src/locale_EN.h
+++ b/src/locale_EN.h
@@ -108,7 +108,6 @@ MAKE_PSTR(gpio_mandatory, "<gpio>")
 MAKE_PSTR(data_optional, "[data]")
 MAKE_PSTR(typeid_mandatory, "<type ID>")
 MAKE_PSTR(deviceid_mandatory, "<device ID>")
-MAKE_PSTR(deviceid_optional, "[device ID]")
 MAKE_PSTR(invalid_log_level, "Invalid log level")
 MAKE_PSTR(log_level_fmt, "Log level = %s")
 MAKE_PSTR(log_level_optional, "[level]")