diff --git a/PlayerState.py b/PlayerState.py
index dd0775a..6c75a67 100644
--- a/PlayerState.py
+++ b/PlayerState.py
@@ -290,8 +290,9 @@ class PlayerState:
         if not self.isActive:
             return
 
-        self.replayBall = True
-        self.replayBallTimer = Timer(interval=1, function=self.updateReplayBall)
+        if self.ballsleft == 0 and self.bonusTime != 0:
+            self.replayBall = True
+            self.replayBallTimer = Timer(interval=1, function=self.updateReplayBall)
 
     def updateReplayBall(self):
         self.bonusTime -= 1
diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py
index 03b596a..fbd550f 100644
--- a/events/EndBallEvent.py
+++ b/events/EndBallEvent.py
@@ -23,6 +23,7 @@ class EndBallEvent(Event):
         TopFlipper().deactivate()
         MainFlipper().deactivate()
 
+        self.gameState.currentPlayer.setReplayBall()
         if self.gameState.currentPlayer.replayBall or not self.gameState.currentPlayer.hasBallScored:
             OutHoleSolenoid().trigger()
             return