diff --git a/PlayerState.py b/PlayerState.py
index f55711c..91aaf5a 100644
--- a/PlayerState.py
+++ b/PlayerState.py
@@ -177,6 +177,8 @@ class PlayerState:
     def resetTargets(self):
         self.resetBanks()
         self.resetRedSpecial()
+        ORANGE_SPECIAL_LAMPS.deactivate()
+        ORANGE_SPECIAL_LAMPS.activateNext()
         self.resetOrangeSpecial()
         self.resetTunnel()
 
diff --git a/events/OrangeSpecialEvent.py b/events/OrangeSpecialEvent.py
index 5cd5ee1..86ca4b3 100644
--- a/events/OrangeSpecialEvent.py
+++ b/events/OrangeSpecialEvent.py
@@ -6,7 +6,6 @@ from lamps.LampGroup import ORANGE_SPECIAL_LAMPS
 class OrangeSpecialEvent(SpecialEvent):
     def __init__(self, gameState):
         super().__init__("Orange Special Event", gameState)
-        ORANGE_SPECIAL_LAMPS.activateNext()
         self.points = 100000
 
     def trigger(self, target):