diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java
index 7669c38a21a..b5757d6cfb4 100644
--- a/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/src/main/java/forge/game/phase/PhaseHandler.java
@@ -378,6 +378,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
                     c.onCleanupPhase(playerTurn);
                 }
 
+                game.getEndOfCombat().executeUntil(); //Repeat here in case Time Stop et. al. ends combat early
                 game.getEndOfTurn().executeUntil();
 
                 for (Player player : game.getPlayers()) {