diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
index 24531e30a63..fd100377340 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
@@ -541,8 +541,7 @@ public class AbilityFactoryEffect {
             if ((duration == null) || duration.equals("EndOfTurn")) {
                 AllZone.getEndOfTurn().addUntil(endEffect);
             }
-
-            if (duration.equals("UntilHostLeavesPlay")) {
+            else if (duration.equals("UntilHostLeavesPlay")) {
                 card.addLeavesPlayCommand(endEffect);
             }
         }