diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
index 00899c8..886e14a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
@@ -39,13 +39,7 @@ public class ThermostatController {
         newT.setName(t.getName());
         newT.setRoomId(t.getRoomId());
         newT.setUseExternalSensors(t.isUseExternalSensors());
-
-        if (t.isTurnOn()) {
-            newT.setMode(Thermostat.Mode.IDLE);
-            thermostatService.computeState(newT);
-        } else {
-            newT.setMode(Thermostat.Mode.OFF);
-        }
+        newT.setOn(t.isTurnOn());
 
         newT = thermostatRepository.save(newT);
         thermostatService.populateMeasuredTemperature(newT);