diff --git a/forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java
index fd2ea7e66c5..e6e3794a12f 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java
@@ -26,6 +26,8 @@ public class EndTurnEffect extends SpellAbilityEffect {
             game.getAction().exile(c);
         }
         game.getStack().clear();
+        game.getStack().clearSimultaneousStack();
+        game.getTriggerHandler().clearWaitingTriggers();
 
         // 2) All attacking and blocking creatures are removed from combat.
         game.getPhaseHandler().endCombat();
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index c8ea27e9d34..4ec7c7d016d 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -324,6 +324,10 @@ public class TriggerHandler {
         return checkStatics;
     }
 
+    public void clearWaitingTriggers() {
+        waitingTriggers.clear();
+    }
+
     private boolean runNonStaticTriggersForPlayer(final Player player, final TriggerType mode, 
             final Map<String, Object> runParams, final List<Trigger> delayedTriggersWorkingCopy ) {