diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index d5e7b91d83d..4f83dd57cdd 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -210,6 +210,8 @@ public class ComputerUtil {
         final Card source = sa.getHostCard();
         if (sa.isSpell() && !source.isCopiedSpell()) {
             source.setCastSA(sa);
+            sa.setLastStateBattlefield(game.getLastStateBattlefield());
+            sa.setLastStateGraveyard(game.getLastStateGraveyard());
             sa.setHostCard(game.getAction().moveToStack(source));
         }
         final Cost cost = sa.getPayCosts();
@@ -231,6 +233,8 @@ public class ComputerUtil {
         final Card source = sa.getHostCard();
         if (sa.isSpell() && !source.isCopiedSpell()) {
             source.setCastSA(sa);
+            sa.setLastStateBattlefield(game.getLastStateBattlefield());
+            sa.setLastStateGraveyard(game.getLastStateGraveyard());
             sa.setHostCard(ai.getGame().getAction().moveToStack(source));
         }
 
@@ -248,6 +252,8 @@ public class ComputerUtil {
         final Card source = newSA.getHostCard();
         if (newSA.isSpell() && !source.isCopiedSpell()) {
             source.setCastSA(newSA);
+            sa.setLastStateBattlefield(game.getLastStateBattlefield());
+            sa.setLastStateGraveyard(game.getLastStateGraveyard());
             newSA.setHostCard(game.getAction().moveToStack(source));
         }
 
@@ -265,6 +271,8 @@ public class ComputerUtil {
             final Card source = sa.getHostCard();
             if (sa.isSpell() && !source.isCopiedSpell()) {
                 source.setCastSA(sa);
+                sa.setLastStateBattlefield(game.getLastStateBattlefield());
+                sa.setLastStateGraveyard(game.getLastStateGraveyard());
                 sa.setHostCard(game.getAction().moveToStack(source));
             }