diff --git a/Mage.Sets/src/mage/cards/z/ZirdaTheDawnwaker.java b/Mage.Sets/src/mage/cards/z/ZirdaTheDawnwaker.java
index 9360629a5e..065c655da3 100644
--- a/Mage.Sets/src/mage/cards/z/ZirdaTheDawnwaker.java
+++ b/Mage.Sets/src/mage/cards/z/ZirdaTheDawnwaker.java
@@ -86,7 +86,7 @@ enum ZirdaTheDawnwakerCompanionCondition implements CompanionCondition {
 class ZirdaTheDawnwakerEffect extends CostModificationEffectImpl {
 
     ZirdaTheDawnwakerEffect() {
-        super(Duration.Custom, Outcome.Benefit, CostModificationType.REDUCE_COST);
+        super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.REDUCE_COST);
         staticText = "Abilities you activate that aren't mana abilities cost {2} less to activate. "
                 + "This effect can't reduce the mana in that cost to less than one mana";
     }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZirdaTheDawnwakerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZirdaTheDawnwakerTest.java
index a13283ca34..1ac5ed7b02 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZirdaTheDawnwakerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZirdaTheDawnwakerTest.java
@@ -72,4 +72,33 @@ public class ZirdaTheDawnwakerTest extends CardTestPlayerBase {
         assertGraveyardCount(playerB, 2);
         assertGraveyardCount(playerB, lion, 0);
     }
+
+    @Test
+    public void testWithGeth2() {
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
+        addCard(Zone.BATTLEFIELD, playerA, geth);
+        addCard(Zone.GRAVEYARD, playerB, zirda);
+        addCard(Zone.GRAVEYARD, playerB, lion);
+
+        setChoice(playerA, "X=3");
+        addTarget(playerA, zirda);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{X}{B}");
+
+        setChoice(playerA, "X=2");
+        addTarget(playerA, lion);
+        activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{X}{B}");
+
+        setStrictChooseMode(true);
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+        assertAllCommandsUsed();
+
+        assertPermanentCount(playerA, zirda, 1);
+        assertPermanentCount(playerA, lion, 1);
+        assertTapped(zirda, true);
+        assertTapped(lion, true);
+        assertGraveyardCount(playerB, 2 + 3);
+        assertGraveyardCount(playerB, zirda, 0);
+        assertGraveyardCount(playerB, lion, 0);
+    }
 }