diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index de4977b5c49..2a9c487eb70 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -140,7 +140,9 @@ public class GameAction {
             return c;
         }
 
-        game.setChangeZoneLKIInfo(c);
+        if (zoneFrom != null && zoneTo != null && !zoneFrom.is(ZoneType.Stack) && !zoneTo.is(ZoneType.Stack)) {
+            game.setChangeZoneLKIInfo(c);
+        }
 
         boolean suppress = !c.isToken() && zoneFrom.equals(zoneTo);