diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index 7989323a6a6..1133a8e9c6e 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -183,6 +183,8 @@ public class PhaseHandler implements java.io.Serializable {
             }
         }
 
+        game.getStack().clearUndoStack(); //can't undo action from previous phase
+
         String phaseType = oldPhase == phase ? "Repeat" : phase == PhaseType.getNext(oldPhase) ? "" : "Additional";
 
         if (this.phase == PhaseType.UNTAP) {
diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java
index e1390197505..8184246ff72 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -256,6 +256,15 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         return true;
     }
 
+    /**
+     * <p>
+     * clearUndoStack.
+     * </p>
+     */
+    public final void clearUndoStack() {
+        undoStack.clear();
+    }
+
     /**
      * <p>
      * add.