diff --git a/tasks/heater.py b/tasks/heater.py
index 24b7c92..0b69058 100755
--- a/tasks/heater.py
+++ b/tasks/heater.py
@@ -79,6 +79,8 @@ class HeaterTask(ATask):
 			elif pair[0] == 'Disconnect':
 				self.device.activate(False)
 				self.device.disconnect()
+				self.power_soll = 0
+				self.power_set_changed(0)
 			elif 'Power' in pair[0]:
 				self.power_soll = pair[1]
 
diff --git a/tasks/stirrer.py b/tasks/stirrer.py
index b52218b..3a3e61e 100644
--- a/tasks/stirrer.py
+++ b/tasks/stirrer.py
@@ -45,6 +45,7 @@ class StirrerTask(ATask):
 			elif pair[0] == 'Disconnect':
 				self.device.activate(False)
 				self.device.disconnect()
+				self.device.set_speed(0.0)
 			elif 'Speed' in pair[0]:
 				self.device.set_speed(pair[1])