diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index cd2c6eb593..851bdb41af 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -574,7 +574,7 @@ std::string LLCacheName::buildFullName(const std::string& first, const std::stri
 std::string LLCacheName::cleanFullName(const std::string& full_name)
 {
 // <FS:CR> FIRE-6659: Legacy "Resident" name toggle
-	return (LLAvatarName::trimResidentSurname() ? full_name : full_name.substr(0, full_name.find(" Resident")));
+	return (!LLAvatarName::trimResidentSurname() ? full_name : full_name.substr(0, full_name.find(" Resident")));
 // </FS:CR> FIRE-6659: Legacy "Resident" name toggle
 }