diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
index fad4a95d..f973bc04 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
@@ -535,13 +535,15 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, Update
             return;
         }
 
-        if (animationDuration > 0 && --animationDuration <= 0) {
+        if (animationDuration <= 0 || --animationDuration <= 0) {
 
             if (animation.renderBothArms() && acrobatics.distanceClimbed > 0) {
                 return;
             }
 
-            setAnimation(AnimationInstance.NONE);
+            if (!getAnimation().isOf(Animation.NONE)) {
+                setAnimation(AnimationInstance.NONE);
+            }
         }
     }