diff --git a/components/actor/heater_hendi.py b/components/actor/heater_hendi.py
index 74e557b..d037dc8 100644
--- a/components/actor/heater_hendi.py
+++ b/components/actor/heater_hendi.py
@@ -34,10 +34,10 @@ class HeaterHendi(AHeater):
 		else:
 			self.hendi.setSwitch(1)
 		self.hendi.setPowerWatts(power)
-		self.power_eff = self.hendi.getPowerWatts()
+		self.power_eff = self.hendi.getPowerWatts() if self.hendi.getSwitch() == 1 else 0
 
 	def set_power(self, power):
-		self.power_set = max(self.get_power_min(), min(self.get_power_max(), power))
+		self.power_set = min(self.get_power_max(), power)
 
 	def get_power(self):
 		return self.power_eff