diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2e7fb38049..598c782d53 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3401,6 +3401,9 @@ namespace OpenSim.Region.Framework.Scenes
                 if (PhysicsSit(part,offset)) // physics engine
                     return;
 
+                if (Vector3.DistanceSquared(AbsolutePosition, pos) > 100f)
+                    return;
+
                 AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight);
             }