diff --git a/ThermiaOnlineAPI/model/WaterHeater.py b/ThermiaOnlineAPI/model/WaterHeater.py
index dcc2888..f4dbb27 100644
--- a/ThermiaOnlineAPI/model/WaterHeater.py
+++ b/ThermiaOnlineAPI/model/WaterHeater.py
@@ -27,14 +27,14 @@ def refetch_data(self):
 
     def set_temperature(self, temperature: int):
         LOGGER.info("Setting temperature to " + str(temperature))
-        self.__api_interface.set_temperature(self, temperature)
         self.__status["heatingEffect"] = temperature # update local state before refetching data
+        self.__api_interface.set_temperature(self, temperature)
         self.refetch_data()
 
     def set_operation_mode(self, mode: str):
         LOGGER.info("Setting operation mode to " + str(mode))
-        self.__api_interface.set_operation_mode(self, mode)
         self.__operation_mode_state["current"] = mode # update local state before refetching data
+        self.__api_interface.set_operation_mode(self, mode)
         self.refetch_data()
 
     @property
diff --git a/setup.py b/setup.py
index 618fa1c..ae3f406 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 setup(
   name='ThermiaOnlineAPI',
   packages=['ThermiaOnlineAPI', 'ThermiaOnlineAPI.api', 'ThermiaOnlineAPI.model'],
-  version='1.5',
+  version='1.6',
   license='GPL-3.0',
   description='A Python API for Thermia heat pumps using https://online.thermia.se',
   long_description=long_description,