diff --git a/indra/newview/fsmaniprotatejoint.cpp b/indra/newview/fsmaniprotatejoint.cpp
index da01a29f0a..e442fbab93 100644
--- a/indra/newview/fsmaniprotatejoint.cpp
+++ b/indra/newview/fsmaniprotatejoint.cpp
@@ -387,14 +387,11 @@ void FSManipRotateJoint::setJoint(LLJoint* joint)
 void FSManipRotateJoint::setAvatar(LLVOAvatar* avatar)
 {
     mAvatar = avatar;
-
     if (!avatar)
         mJoint = nullptr;
 
-    if (!mJoint)
-        return;
-
-    setJoint(avatar->getJoint(mJoint->getJointNum()));
+    if (mAvatar && mJoint)
+        setJoint(avatar->getJoint(mJoint->getJointNum()));
 }
 
 /**