diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
index 87cf6610324..8c340cc626b 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
@@ -92,11 +92,13 @@ public class ChangeTargetsEffect extends SpellAbilityEffect {
                 while(changingTgtSI != null) {
                     SpellAbility changingTgtSA = changingTgtSI.getSpellAbility(true);
                     if (sa.hasParam("RandomTarget")){
-                        changingTgtSA.resetTargets();
-                        List<GameEntity> candidates = changingTgtSA.getTargetRestrictions().getAllCandidates(changingTgtSA, true);
-                        GameEntity choice = Aggregates.random(candidates);
-                        changingTgtSA.getTargets().add(choice);
-                        changingTgtSI.updateTarget(changingTgtSA.getTargets());
+                        if (changingTgtSA.usesTargeting()) {
+                            changingTgtSA.resetTargets();
+                            List<GameEntity> candidates = changingTgtSA.getTargetRestrictions().getAllCandidates(changingTgtSA, true);
+                            GameEntity choice = Aggregates.random(candidates);
+                            changingTgtSA.getTargets().add(choice);
+                            changingTgtSI.updateTarget(changingTgtSA.getTargets());
+                        }
                     }
                     else if (sa.hasParam("DefinedMagnet")){
                         GameObject newTarget = Iterables.getFirst(getDefinedCardsOrTargeted(sa, "DefinedMagnet"), null);