diff --git a/d2render/animated_entity.go b/d2render/animated_entity.go
index 8c6f9cd6..9c299f30 100644
--- a/d2render/animated_entity.go
+++ b/d2render/animated_entity.go
@@ -160,9 +160,14 @@ func (v *AnimatedEntity) SetTarget(tx, ty float64, action int32) {
 		newAnimationMode = d2enum.AnimationModeMonsterWalk.String()
 	}
 
+	if newAnimationMode != v.animationMode {
+		v.SetMode(newAnimationMode, v.weaponClass, v.direction)
+	}
+
 	newDirection := angleToDirection(float64(angle), v.composite.GetDirectionCount())
-	if newDirection != v.GetDirection() || newAnimationMode != v.animationMode {
-		v.SetMode(newAnimationMode, v.weaponClass, newDirection)
+
+	if newDirection != v.GetDirection() {
+		v.SetMode(v.animationMode, v.weaponClass, newDirection)
 	}
 }