diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 87cf135c85..fc8e0d7186 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2440,7 +2440,10 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             m_linkedPrim = part.UUID;
-
+            if (part.GetAvatarOnSitTarget() != UUID)
+            {
+                m_offsetRotation = m_offsetRotation / part.RotationOffset;
+            }
             Velocity = Vector3.Zero;
             RemoveFromPhysicalScene();
             Animator.TrySetMovementAnimation(sitAnimation);