diff --git a/Runtime/Tools/Scripts/Socket.cs b/Runtime/Tools/Scripts/Socket.cs
index 52e7bdf..94f0693 100644
--- a/Runtime/Tools/Scripts/Socket.cs
+++ b/Runtime/Tools/Scripts/Socket.cs
@@ -504,6 +504,14 @@ namespace Passer {
             joint.breakForce = float.PositiveInfinity;
             joint.breakTorque = float.PositiveInfinity;
 
+
+            Rigidbody socketRigidbody = GetComponent<Rigidbody>();
+            if (socketRigidbody == null) {
+                socketRigidbody = this.gameObject.AddComponent<Rigidbody>();
+                socketRigidbody.isKinematic = true;
+            }
+            joint.connectedBody = socketRigidbody;
+
             attachedTransform = objRigidbody.transform;
             attachedHandle = handle;
             handle.socket = this;
@@ -765,7 +773,7 @@ namespace Passer {
             }
         }
 
-#endregion Rigidbody
+        #endregion Rigidbody
 
         #region Static Object
 
@@ -811,7 +819,7 @@ namespace Passer {
 
         #endregion Static Object
 
-#endregion Release
+        #endregion Release
 
         #region Start