diff --git a/PlayerState.py b/PlayerState.py
index 5bfd1e1..405493e 100644
--- a/PlayerState.py
+++ b/PlayerState.py
@@ -320,15 +320,15 @@ class PlayerState:
         self.upperPlayfieldTimer.start()
 
     def updatePlayfieldTime(self):
+        if self.upperPlayfieldTime in [0, 5, 10, 20]:
+            UPPER_PLAYFIELD_TIME_LAMPS.deactivateCurrent()
+
         if self.upperPlayfieldTime == 0:
             self.upperPlayfieldTimer = None
             LeaveUpperPlayfieldEvent(self).trigger(None)
             logging.info("Stopped Upper Playfield Timer")
             return
 
-        if self.upperPlayfieldTime in [0, 5, 10, 20]:
-            UPPER_PLAYFIELD_TIME_LAMPS.deactivateCurrent()
-
         self.upperPlayfieldTime -= 5
         logging.info("Playfield time left: " + str(self.upperPlayfieldTime))
         self.upperPlayfieldTimer = Timer(interval=5, function=self.updatePlayfieldTime)