diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java
index 3f3ad49580..10857231df 100644
--- a/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java
+++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java
@@ -96,6 +96,7 @@ public class ConditionalManaEffect extends ManaEffect {
         }
 
         if (mana != null) {
+            checkToFirePossibleEvents(mana, game, source);
             controller.getManaPool().addMana(mana, game, source);
         }
         return true;
@@ -114,9 +115,6 @@ public class ConditionalManaEffect extends ManaEffect {
         } else if (otherwiseEffect != null) {
             mana = otherwiseEffect.getMana();
         }
-        if (mana != null) {
-            checkToFirePossibleEvents(mana, game, source);
-        }
         return mana;
     }
 }