diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index b5d49b2826dd3fe62a5f84b2e0269b1a01bd95bc..1d5813747584c6983b70ee36702f916b27e64bac 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -2607,22 +2607,10 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SHOWNAMES>::onCommandToggle(ERlvBehaviou
 	// Refresh the nearby participant list
 	if (LLFloaterIMNearbyChat* pNearbyChatFloater = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))
 	{
-#ifdef CATZNIP
-		// Legacy chat (Catznip)
-		if (LLParticipantAvatarList* pParticipantList = dynamic_cast<LLParticipantAvatarList*>(pNearbyChatFloater->getParticipantList()))
-		{
-			if (LLAvatarList* pAvatarList = pParticipantList->getAvatarList())
-			{
-				pAvatarList->updateAvatarNames();
-			}
-		}
-#else
-		// CHUI
 		if (LLParticipantList* pParticipantList = pNearbyChatFloater->getParticipantList())
 		{
-			pParticipantList->reset();
+			pParticipantList->refreshNames();
 		}
-#endif // CATZNIP
 	}
 
 	// Force the use of the "display name" cache so we can filter both display and legacy names (or return back to the user's preference)