diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py
index 470a89c..138978e 100644
--- a/events/EndBallEvent.py
+++ b/events/EndBallEvent.py
@@ -30,13 +30,16 @@ class EndBallEvent(Event):
         TopFlipper().deactivate()
         MainFlipper().deactivate()
 
+        if self.gameState.currentPlayer.ballsLeft > 0:
+            self.gameState.currentPlayer.removeBall()
+
         self.gameState.currentPlayer.setReplayBall()
+
         if self.gameState.currentPlayer.replayBall or not self.gameState.currentPlayer.hasBallScored:
             OutHoleSolenoid().trigger()
             return
 
         self.gameState.isPlaying = False
-        self.gameState.currentPlayer.removeBall()
 
         self.scorePoints()
         self.gameState.currentPlayer.deactivate()