diff --git a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
index f77d29a2a0..db4003edc0 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
@@ -57,7 +57,10 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (animID == UUID.Zero)
             {
-                m_overrides.Remove(state);
+                if (state == "ALL")
+                    m_overrides.Clear();
+                else
+                    m_overrides.Remove(state);
                 return;
             }