diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java
index 611df2e2b6f..4b2196ffcf1 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java
@@ -251,6 +251,9 @@ public final class AbilityFactory_Animate {
             else if (params.containsKey("UntilHostLeavesPlay")) {
                 sb.append(" until ").append(host).append(" leaves the battlefield.");
             }
+            else if (params.containsKey("UntilYourNextUpkeep")) {
+                sb.append(" until your next upkeep.");
+            }
             else {
                 sb.append(" until end of turn.");
             }
@@ -601,6 +604,9 @@ public final class AbilityFactory_Animate {
                 else if (params.containsKey("UntilHostLeavesPlay")) {
                     host.addLeavesPlayCommand(unanimate);
                 }
+                else if (params.containsKey("UntilYourNextUpkeep")) {
+                    AllZone.getUpkeep().addUntil(host.getController(), unanimate);
+                }
                 else {
                     AllZone.getEndOfTurn().addUntil(unanimate);
                 }