diff --git a/mpf/platforms/interfaces/light_platform_interface.py b/mpf/platforms/interfaces/light_platform_interface.py
index db0ec4ed5..58e8a690a 100644
--- a/mpf/platforms/interfaces/light_platform_interface.py
+++ b/mpf/platforms/interfaces/light_platform_interface.py
@@ -95,6 +95,9 @@ def set_fade(self, start_brightness, start_time, target_brightness, target_time)
             self.task = self.loop.create_task(self._fade(start_brightness, start_time, target_brightness, target_time))
             self.task.add_done_callback(Util.raise_exceptions)
         else:
+            if self.task:
+                self.task.cancel()
+                self.task = None
             self.set_brightness_and_fade(target_brightness, max(fade_ms, 0))
 
     async def _fade(self, start_brightness, start_time, target_brightness, target_time):