diff --git a/Client/Assets/Scripts/ZeroGravity/Objects/MyPlayer.cs b/Client/Assets/Scripts/ZeroGravity/Objects/MyPlayer.cs
index ad7f327a..90cf0573 100644
--- a/Client/Assets/Scripts/ZeroGravity/Objects/MyPlayer.cs
+++ b/Client/Assets/Scripts/ZeroGravity/Objects/MyPlayer.cs
@@ -306,6 +306,19 @@ public override BaseSceneTrigger LockedToTrigger
 				}
 
 				base.LockedToTrigger = value;
+
+				if (FpsController != null)
+				{
+					if (value is SceneTriggerShipControl)
+					{
+						FpsController.LockPlayerToPoint(locked: true, value.transform);
+					}
+					else
+					{
+						FpsController.LockPlayerToPoint(locked: false);
+						transform.SetParent(null, worldPositionStays: true);
+					}
+				}
 			}
 		}
 
@@ -2945,6 +2958,11 @@ public void SetMyRoomTrigger(SpaceObjectVessel vessel)
 
 		public void ToggleRagdoll(bool? enabled = null)
 		{
+			if (LockedToTrigger != null && (enabled ?? !_isRagdolled))
+			{
+				return;
+			}
+
 			if (enabled.HasValue)
 			{
 				_isRagdolled = enabled.Value;