diff --git a/cbpi/extension/mashstep/__init__.py b/cbpi/extension/mashstep/__init__.py
index b94fa70..700ebf4 100644
--- a/cbpi/extension/mashstep/__init__.py
+++ b/cbpi/extension/mashstep/__init__.py
@@ -71,8 +71,6 @@ class WaitStep(CBPiStep):
     async def on_start(self):
         if self.timer is None:
             self.timer = Timer(int(self.props.Timer) * 60,on_update=self.on_timer_update, on_done=self.on_timer_done)
-        if self.cbpi.kettle is not None:
-            await self.cbpi.kettle.set_target_temp(self.props.Kettle, int(self.props.Temp))
         self.timer.start()
 
     async def on_stop(self):
@@ -137,7 +135,8 @@ class BoilStep(CBPiStep):
     async def on_start(self):
         if self.timer is None:
             self.timer = Timer(int(self.props.Timer) *60 ,on_update=self.on_timer_update, on_done=self.on_timer_done)
-
+        if self.cbpi.kettle is not None:
+            await self.cbpi.kettle.set_target_temp(self.props.Kettle, int(self.props.Temp))
         self.summary = "Waiting for Target Temp"
         await self.push_update()