diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
index f47345d9d..f4bdff292 100644
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -21,6 +21,7 @@ This release is based on the latest Espressif/Arduino core version 3. It brings
 - Ethernet MAC address changed with the new SDK, breaking DHCP reservations (currently disabled)
 - "IPv4 nameserver" showed an IPv6 address when IPv6 was in use
 - HA Discovery warning on Uptime after EMS-ESP boot due to NTP not ready
+- hc/control setting for UI800 thermostats [#3181](https://github.com/emsesp/EMS-ESP32/discussions/3181)
 
 ## Changed
 
diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index b8d878786..58d563a91 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -2402,7 +2402,7 @@ bool Thermostat::set_control(const char * value, const int8_t id) {
         // BC400
         // 1-RC100, 2-RC100H, 3-RC200
     } else if (model() == EMSdevice::EMS_DEVICE_FLAG_BC400 || model() == EMSdevice::EMS_DEVICE_FLAG_UI800) {
-        if (Helpers::value2enum(value, ctrl, FL_(enum_control2))) {
+        if (Helpers::value2enum(value, ctrl, model() == EMSdevice::EMS_DEVICE_FLAG_UI800 ? FL_(enum_control3) : FL_(enum_control2))) {
             write_command(hpmode_typeids[hc->hc()], 3, ctrl);
             hc->control = ctrl; // set in advance, dont wait for verify
             if (hc->remotetemp != EMS_VALUE_INT16_NOTSET && ctrl > 0) {
diff --git a/src/emsesp_version.h b/src/emsesp_version.h
index 19dbf2a47..e7d93e24b 100644
--- a/src/emsesp_version.h
+++ b/src/emsesp_version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.9.0-dev.5"
+#define EMSESP_APP_VERSION "3.9.0-dev.6"