diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 4acb9fd4804fa5b9b4e21d6b30d760ae472c410e..efdaff3f6ac3d2bfa33a6afee4f9519ad4609f9f 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -293,7 +293,12 @@ void LLNearbyChatToastPanel::draw()
 {
 	if(mIsDirty)
 	{
-		getChild<LLAvatarIconCtrl>("avatar_icon", false)->setValue(mFromID);
+		LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon", false);
+		if(icon)
+		{
+			icon->setDrawTooltip(mSourceType == CHAT_SOURCE_AGENT);
+			icon->setValue(mFromID);
+		}
 		mIsDirty = false;
 	}
 	LLToastPanelBase::draw();