diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
index 7337f780314..279c2efffac 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
@@ -266,6 +266,9 @@ public class EffectEffect extends SpellAbilityEffect {
             else if (duration.equals("UntilYourNextTurn")) {
                 game.getCleanup().addUntil(controller, endEffect);
             }
+            else if (duration.equals("UntilYourNextUpkeep")) {
+                game.getUpkeep().addUntil(controller, endEffect);
+            }
             else if (duration.equals("UntilEndOfCombat")) {
                 game.getEndOfCombat().addUntil(endEffect);
             }