diff --git a/src/main/java/forge/game/ai/ComputerUtil.java b/src/main/java/forge/game/ai/ComputerUtil.java
index b0dd3b6b420..d11420407fc 100644
--- a/src/main/java/forge/game/ai/ComputerUtil.java
+++ b/src/main/java/forge/game/ai/ComputerUtil.java
@@ -278,6 +278,7 @@ public class ComputerUtil {
      *            a {@link forge.card.spellability.SpellAbility} object.
      */
     public static final void playNoStack(final AIPlayer ai, final SpellAbility sa, final GameState game) {
+        sa.setActivatingPlayer(ai);
         // TODO: We should really restrict what doesn't use the Stack
         if (ComputerUtilCost.canPayCost(sa, ai)) {
             final Card source = sa.getSourceCard();
@@ -285,8 +286,6 @@ public class ComputerUtil {
                 sa.setSourceCard(game.getAction().moveToStack(source));
             }
 
-            sa.setActivatingPlayer(ai);
-
             final Cost cost = sa.getPayCosts();
             if (cost == null) {
                 ComputerUtilMana.payManaCost(ai, sa);