diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
index 3708abf4cf6..1ba76c5c452 100644
--- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
@@ -158,7 +158,7 @@ public abstract class SpellAbilityEffect {
             if (isPlainText) {
                 if(t.startsWith("NICKNAME")) {
                     sb.append(TextUtil.fastReplace(t,"NICKNAME", sa.getHostCard().getName().split(",")[0]));
-                } else {
+                } else if(t.startsWith("CARDNAME")) {
                     sb.append(TextUtil.fastReplace(t, "CARDNAME", sa.getHostCard().getName()));
                 }
             } else {