diff --git a/Mage.Sets/src/mage/cards/h/HearthcageGiant.java b/Mage.Sets/src/mage/cards/h/HearthcageGiant.java
index 94eb0488f69..1d206d68b2f 100644
--- a/Mage.Sets/src/mage/cards/h/HearthcageGiant.java
+++ b/Mage.Sets/src/mage/cards/h/HearthcageGiant.java
@@ -44,7 +44,7 @@ public final class HearthcageGiant extends CardImpl {
         this.toughness = new MageInt(5);
 
         //When Hearthcage Giant enters the battlefield, create two 3/1 red Elemental Shaman creature tokens.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ElementalShamanToken("LRW"), 2), false));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ElementalShamanToken(), 2), false));
 
         //Sacrifice an Elemental: Target Giant creature gets +3/+1 until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filterElemental)));
diff --git a/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java b/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java
index 62b6d424751..e4af10cb469 100644
--- a/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java
+++ b/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java
@@ -100,7 +100,7 @@ class RebellionOfTheFlamekinEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Token token = new ElementalShamanToken("LRW");
+        Token token = new ElementalShamanToken();
         token.putOntoBattlefield(1, game, source, source.getControllerId());
 
         List<Permanent> permanents = token
diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java
index 69cac19b37b..5e9050fd6f6 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java
@@ -15,14 +15,7 @@ import mage.constants.SubType;
  */
 public final class ElementalShamanToken extends TokenImpl {
 
-    static final private List<String> tokenImageSets = new ArrayList<>();
-
-    static {
-        tokenImageSets.addAll(Arrays.asList("C15", "JVC", "DD2", "LRW", "CM2"));
-    }
-
     public ElementalShamanToken(boolean withHaste) {
-        this("DD2");
         if (withHaste) {
             addAbility(HasteAbility.getInstance());
             description = description + " with haste";
@@ -30,19 +23,15 @@ public final class ElementalShamanToken extends TokenImpl {
     }
 
     public ElementalShamanToken() {
-        this("LRW");
-    }
-
-    public ElementalShamanToken(String setCode) {
         super("Elemental Shaman Token", "3/1 red Elemental Shaman creature token");
-        availableImageSetCodes = tokenImageSets;
-        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         subtype.add(SubType.ELEMENTAL);
         subtype.add(SubType.SHAMAN);
         power = new MageInt(3);
         toughness = new MageInt(1);
+
+        availableImageSetCodes = Arrays.asList("C15", "JVC", "DD2", "LRW", "CM2");
     }
 
     public ElementalShamanToken(final ElementalShamanToken token) {