diff --git a/Mage.Sets/src/mage/cards/c/ChandrasFiremaw.java b/Mage.Sets/src/mage/cards/c/ChandrasFiremaw.java
index 368e39f9193..0a87253ad98 100644
--- a/Mage.Sets/src/mage/cards/c/ChandrasFiremaw.java
+++ b/Mage.Sets/src/mage/cards/c/ChandrasFiremaw.java
@@ -35,7 +35,7 @@ public final class ChandrasFiremaw extends CardImpl {
         this.addAbility(HasteAbility.getInstance());
 
         // When Chandra's Firemaw enters the battlefield, you may search your library and/or graveyard for a card named Chandra, Flame's Catalyst, reveal it, and put it into your hand. If you search your library this way, shuffle it.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryGraveyardPutInHandEffect(filter)));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryGraveyardPutInHandEffect(filter),true));
     }
 
     private ChandrasFiremaw(final ChandrasFiremaw card) {
diff --git a/Mage.Sets/src/mage/cards/t/TeferisWavecaster.java b/Mage.Sets/src/mage/cards/t/TeferisWavecaster.java
new file mode 100644
index 00000000000..54725309f87
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/t/TeferisWavecaster.java
@@ -0,0 +1,50 @@
+package mage.cards.t;
+
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.search.SearchLibraryGraveyardPutInHandEffect;
+import mage.abilities.keyword.FlashAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.filter.FilterCard;
+import mage.filter.predicate.mageobject.NamePredicate;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class TeferisWavecaster extends CardImpl {
+
+    private static final FilterCard filter = new FilterCard("Teferi, Timeless Voyager");
+
+    static {
+        filter.add(new NamePredicate("Teferi, Timeless Voyager"));
+    }
+
+    public TeferisWavecaster(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{U}");
+
+        this.subtype.add(SubType.MERFOLK);
+        this.subtype.add(SubType.WIZARD);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // Flash
+        this.addAbility(FlashAbility.getInstance());
+
+        // When Teferi's Wavecaster enters the battlefield, you may search your library and/or graveyard for a card named Teferi, Timeless Voyager, reveal it, and put it into your hand. If you search your library this way, shuffle it.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryGraveyardPutInHandEffect(filter), true));
+    }
+
+    private TeferisWavecaster(final TeferisWavecaster card) {
+        super(card);
+    }
+
+    @Override
+    public TeferisWavecaster copy() {
+        return new TeferisWavecaster(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/CoreSet2021.java b/Mage.Sets/src/mage/sets/CoreSet2021.java
index 75ce0eedab2..abb15a7e709 100644
--- a/Mage.Sets/src/mage/sets/CoreSet2021.java
+++ b/Mage.Sets/src/mage/sets/CoreSet2021.java
@@ -69,6 +69,7 @@ public final class CoreSet2021 extends ExpansionSet {
         cards.add(new SetCardInfo("Spirit of Malevolence", 331, Rarity.COMMON, mage.cards.s.SpiritOfMalevolence.class));
         cards.add(new SetCardInfo("Storm Caller", 335, Rarity.COMMON, mage.cards.s.StormCaller.class));
         cards.add(new SetCardInfo("Teferi's Protege", 77, Rarity.COMMON, mage.cards.t.TeferisProtege.class));
+        cards.add(new SetCardInfo("Teferi's Wavecaster", 327, Rarity.RARE, mage.cards.t.TeferisWavecaster.class));
         cards.add(new SetCardInfo("Teferi, Master of Time", 75, Rarity.MYTHIC, mage.cards.t.TeferiMasterOfTime.class));
         cards.add(new SetCardInfo("Tormod's Crypt", 241, Rarity.UNCOMMON, mage.cards.t.TormodsCrypt.class));
         cards.add(new SetCardInfo("Ugin, the Spirit Dragon", 1, Rarity.MYTHIC, mage.cards.u.UginTheSpiritDragon.class));