diff --git a/forge-game/src/main/java/forge/game/player/PlayerController.java b/forge-game/src/main/java/forge/game/player/PlayerController.java
index 9e9c21b30ad..90b7bcc9c74 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerController.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerController.java
@@ -280,6 +280,9 @@ public abstract class PlayerController {
     public abstract String chooseCardName(SpellAbility sa, Predicate<PaperCard> cpp, String valid, String message);
 
     // better to have this odd method than those if playerType comparison in ChangeZone  
-    public abstract Card chooseSingleCardForZoneChange(ZoneType destination, List<ZoneType> origin, SpellAbility sa, List<Card> fetchList, String selectPrompt, boolean b, Player decider);  
-    
+    public abstract Card chooseSingleCardForZoneChange(ZoneType destination, List<ZoneType> origin, SpellAbility sa, List<Card> fetchList, String selectPrompt, boolean b, Player decider);
+
+    public boolean isGuiPlayer() {
+        return false;
+    }
 }
\ No newline at end of file
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 cb3d1c28764..211c9a0812a 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -288,8 +288,10 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             activator = sp.getActivatingPlayer();
             System.out.println(source.getName() + " - activatingPlayer not set before adding to stack.");
         }
-        
-        if (sp.isUndoable()) { //either push onto or clear undo stack based on where spell/ability is undoable
+
+        //either push onto or clear undo stack based on whether
+        //spell/ability is undoable and activator is the Gui player
+        if (sp.isUndoable() && activator.getController().isGuiPlayer()) {
         	undoStack.push(sp);
         }
         else {
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index c53aa6f26aa..3833d00b64b 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -1165,4 +1165,7 @@ public class PlayerControllerHuman extends PlayerController {
         return chooseSingleEntityForEffect(fetchList, sa, selectPrompt, b, decider);
     }
 
+    public boolean isGuiPlayer() {
+        return lobbyPlayer == GuiBase.getInterface().getGuiPlayer();
+    }
 }