diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index 61d7a776c..0e28ece89 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -631,7 +631,7 @@ void Thermostat::process_RC20Timer(std::shared_ptr<const Telegram> telegram) {
         char    data[sizeof(hc->switchtime1)];
         uint8_t no   = telegram->offset / 2;
         uint8_t day  = telegram->message_data[0] >> 5;
-        uint8_t temp = telegram->message_data[0] & 1;
+        uint8_t temp = telegram->message_data[0] & 7;
         uint8_t time = telegram->message_data[1];
 
         std::string sday = read_flash_string(FL_(enum_dayOfWeek)[day]);
@@ -1176,14 +1176,12 @@ void Thermostat::process_RC35Timer(std::shared_ptr<const Telegram> telegram) {
         char    data[sizeof(hc->switchtime1)];
         uint8_t no   = telegram->offset / 2;
         uint8_t day  = telegram->message_data[0] >> 5;
-        uint8_t on   = telegram->message_data[0] & 0x07;
+        uint8_t on   = telegram->message_data[0] & 1;
         uint8_t time = telegram->message_data[1];
 
         std::string sday = read_flash_string(FL_(enum_dayOfWeek)[day]);
         if (day == 7) {
             snprintf(data, sizeof(data), "%02d not_set", no);
-        } else if (model() == EMS_DEVICE_FLAG_RC30_N) {
-            snprintf(data, sizeof(data), "%02d %s %02d:%02d T%d", no, sday.c_str(), time / 6, 10 * (time % 6), on);
         } else {
             snprintf(data, sizeof(data), "%02d %s %02d:%02d %s", no, sday.c_str(), time / 6, 10 * (time % 6), on ? "on" : "off");
         }
@@ -2470,8 +2468,8 @@ bool Thermostat::set_switchtime(const char * value, const uint16_t type_id, char
         data[1] = time;
     }
 
-    uint8_t max_on = 3;
-    if (model() == EMS_DEVICE_FLAG_RC35) {
+    uint8_t max_on = 4;
+    if (model() == EMS_DEVICE_FLAG_RC35 || model() == EMS_DEVICE_FLAG_RC30_N) {
         max_on = 1;
     }
     if (no > 41 || time > 0x90 || (on > max_on && on != 7)) {
@@ -2481,10 +2479,8 @@ bool Thermostat::set_switchtime(const char * value, const uint16_t type_id, char
     }
     if (data[0] != 0xE7) {
         std::string sday = read_flash_string(FL_(enum_dayOfWeek)[day]);
-        if (model() == EMS_DEVICE_FLAG_RC35) {
+        if (model() == EMS_DEVICE_FLAG_RC35 || model() == EMS_DEVICE_FLAG_RC30_N) {
             snprintf(out, len, "%02d %s %02d:%02d %s", no, sday.c_str(), time / 6, 10 * (time % 6), on ? "on" : "off");
-        } else if (model() == EMS_DEVICE_FLAG_RC30_N) {
-            snprintf(out, len, "%02d %s %02d:%02d T%d", no, sday.c_str(), time / 6, 10 * (time % 6), on + 1);
         } else if (model() == EMS_DEVICE_FLAG_RC20) {
             snprintf(out, len, "%02d %s %02d:%02d T%d", no, sday.c_str(), time / 6, 10 * (time % 6), on);
         } else {