diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java
index df4c1cc326a..d6e80338be9 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactory.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactory.java
@@ -374,7 +374,8 @@ public class CardFactory {
     }
 
     private static void buildPlaneswalkerAbilities(Card card) {
-        if (card.getBaseLoyalty() > 0) {
+    	// etbCounter only for Original Card
+        if (card.getBaseLoyalty() > 0 && card.getCurrentStateName() == CardStateName.Original) {
             final String loyalty = Integer.toString(card.getBaseLoyalty());
             card.addIntrinsicKeyword("etbCounter:LOYALTY:" + loyalty + ":no Condition:no desc");
         }