diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py
index 81e36fd..f51c95a 100644
--- a/events/EndBallEvent.py
+++ b/events/EndBallEvent.py
@@ -28,11 +28,13 @@ class EndBallEvent(Event):
         super().trigger(target)
 
         TopFlipper().deactivate()
-        MainFlipper().deactivate()
+
         if not self.gameState.currentPlayer.hasBallScored:
             OutHoleSolenoid().trigger()
             return
 
+        MainFlipper().deactivate()
+
         if self.gameState.currentPlayer.ballsLeft > 0:
             self.gameState.currentPlayer.removeBall()