diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs
index d503d7df7..965ddd280 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs
@@ -1083,8 +1083,31 @@ namespace Barotrauma
                         }
                     }
                 }
+
                 Limb pullLimb = i == 0 ? leftHand : rightHand;
 
+                if (GameMain.Client == null)
+                {
+                    //stop dragging if there's something between the pull limb and the target limb
+                    Vector2 sourceSimPos = pullLimb.SimPosition;
+                    Vector2 targetSimPos = targetLimb.SimPosition;
+                    if (character.Submarine != null && character.SelectedCharacter.Submarine == null)
+                    {
+                        targetSimPos -= character.Submarine.SimPosition;
+                    }
+                    else if (character.Submarine == null && character.SelectedCharacter.Submarine != null)
+                    {
+                        sourceSimPos -= character.SelectedCharacter.Submarine.SimPosition;
+                    }
+
+                    var body = Submarine.CheckVisibility(sourceSimPos, targetSimPos, ignoreSubs: true);
+                    if (body != null)
+                    {
+                        character.DeselectCharacter();
+                        return;
+                    }
+                }
+
                 if (i == 1 && inWater)
                 {
                     targetLimb.pullJoint.Enabled = false;