diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 973c30ec38..670d259398 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -810,8 +810,11 @@ namespace OpenSim.Region.Environment.Scenes
         // Utility function so the databases don't have to reference axiom.math
         public void SetSitTargetLL(LLVector3 offset, LLQuaternion orientation)
         {
-            m_sitTargetPosition = new Vector3(offset.X, offset.Y, offset.Z);
-            m_sitTargetOrientation = new Quaternion(orientation.W, orientation.X, orientation.Y, orientation.Z);
+            if (!(offset.X == 0 && offset.Y == 0 && offset.Z == 0 && orientation.W == 0 && orientation.X == 0 && orientation.Y == 0 && (orientation.Z == 0 || orientation.Z == 1)))
+            {
+                m_sitTargetPosition = new Vector3(offset.X, offset.Y, offset.Z);
+                m_sitTargetOrientation = new Quaternion(orientation.W, orientation.X, orientation.Y, orientation.Z);
+            }
         }
 
         public Vector3 GetSitTargetPosition()