diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c74d9f1292c6d017f7bb1b43b26fb7228ac2fb4c..d295fc60cd2b8ce5af2ce6c1ee3dca68d9c7f2af 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3097,6 +3097,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
 
 	// Rebuild name tag if state change detected
 	if (mNameString.empty()
+		|| (mNameString.size() == 2 && mNameString[0] == 10 && mNameString[1] == 10) // *TODO : find out why mNameString is sometimes ""
 		|| new_name
 		|| (!title && !mTitle.empty())
 		|| (title && mTitle != title->getString())