diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeXEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeXEffect.java
index 8e5c65c69fd..c5de1175611 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeXEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeXEffect.java
@@ -22,7 +22,9 @@ public class ChangeXEffect extends SpellAbilityEffect {
             if (castSA != null && tgtSA.equals(castSA) && castSA.getXManaCostPaid() != null) {
                 castSA.setXManaCostPaid(castSA.getXManaCostPaid() * 2);
             }
-            tgtSA.setXManaCostPaid(castSA.getXManaCostPaid() * 2);
+            if (tgtSA.getXManaCostPaid() != null) {
+                tgtSA.setXManaCostPaid(tgtSA.getXManaCostPaid() * 2);
+            }
         }
     }
 }