diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ea1506a5a..2b7e54597 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12685,7 +12685,10 @@ This should be as low as possible, but too low may break functionality</string>
   <key>AlwaysRenderFriends</key>
     <map>
       <key>Comment</key>
-      <string>Always render friends regardless of max complexity, a value of 2 will only render friends</string>
+      <string>0 - Render avatars with complexity below RenderAvatarMaxComplexity
+1 - Always renders friends, regardless of max complexity
+2 - Only renders friends
+3 - Only renders self</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index d42592976..791d309e2 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8630,11 +8630,11 @@ bool LLVOAvatar::isTooComplex() const
 {
 	static const LLCachedControl<S32> always_render_friends("AlwaysRenderFriends", 0);
 	bool too_complex;
-	if (isSelf() || (always_render_friends && LLAvatarTracker::instance().isBuddy(getID())))
+	if (isSelf() || (always_render_friends && always_render_friends != 3 && LLAvatarTracker::instance().isBuddy(getID())))
 	{
 		too_complex = false;
 	}
-	else if (always_render_friends == 2)
+	else if (always_render_friends >= 2)
 	{
 		too_complex = true;
 	}