diff --git a/Mage.Sets/src/mage/cards/t/ThunderingDjinn.java b/Mage.Sets/src/mage/cards/t/ThunderingDjinn.java
new file mode 100644
index 00000000000..0339b662019
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/t/ThunderingDjinn.java
@@ -0,0 +1,49 @@
+package mage.cards.t;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.dynamicvalue.common.CardsDrawnThisTurnDynamicValue;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.target.common.TargetAnyTarget;
+import mage.watchers.common.CardsDrawnThisTurnWatcher;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class ThunderingDjinn extends CardImpl {
+
+    public ThunderingDjinn(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{R}");
+
+        this.subtype.add(SubType.DJINN);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(4);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Whenever Thundering Djinn attacks, it deals damage to any target equal to the number of cards you've drawn this turn.
+        Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(
+                CardsDrawnThisTurnDynamicValue.instance
+        ).setText("it deals damage to any target equal to the number of cards you've drawn this turn."), false);
+        ability.addTarget(new TargetAnyTarget());
+        this.addAbility(ability, new CardsDrawnThisTurnWatcher());
+    }
+
+    private ThunderingDjinn(final ThunderingDjinn card) {
+        super(card);
+    }
+
+    @Override
+    public ThunderingDjinn copy() {
+        return new ThunderingDjinn(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/ModernHorizons.java b/Mage.Sets/src/mage/sets/ModernHorizons.java
index ca3e5081e9b..d86ff3a5ca1 100644
--- a/Mage.Sets/src/mage/sets/ModernHorizons.java
+++ b/Mage.Sets/src/mage/sets/ModernHorizons.java
@@ -117,6 +117,7 @@ public final class ModernHorizons extends ExpansionSet {
         cards.add(new SetCardInfo("Sword of Truth and Justice", 229, Rarity.MYTHIC, mage.cards.s.SwordOfTruthAndJustice.class));
         cards.add(new SetCardInfo("Tempered Sliver", 183, Rarity.UNCOMMON, mage.cards.t.TemperedSliver.class));
         cards.add(new SetCardInfo("The First Sliver", 200, Rarity.MYTHIC, mage.cards.t.TheFirstSliver.class));
+        cards.add(new SetCardInfo("Thundering Djinn", 215, Rarity.UNCOMMON, mage.cards.t.ThunderingDjinn.class));
         cards.add(new SetCardInfo("Umezawa's Charm", 111, Rarity.COMMON, mage.cards.u.UmezawasCharm.class));
         cards.add(new SetCardInfo("Undead Augur", 112, Rarity.UNCOMMON, mage.cards.u.UndeadAugur.class));
         cards.add(new SetCardInfo("Urza, Lord High Artificer", 75, Rarity.MYTHIC, mage.cards.u.UrzaLordHighArtificer.class));