diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py
index 138978e..81e36fd 100644
--- a/events/EndBallEvent.py
+++ b/events/EndBallEvent.py
@@ -29,13 +29,16 @@ class EndBallEvent(Event):
 
         TopFlipper().deactivate()
         MainFlipper().deactivate()
+        if not self.gameState.currentPlayer.hasBallScored:
+            OutHoleSolenoid().trigger()
+            return
 
         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:
+        if self.gameState.currentPlayer.replayBall:
             OutHoleSolenoid().trigger()
             return