diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 09de387db..6e35d5481 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3577,7 +3577,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 				sChatObjectAuth[from_id] = 1;
 				return;
 			}
-			else if (sChatObjectAuth.find(from_id) != sChatObjectAuth.end())
+			else if (from_id.isNull() || sChatObjectAuth.find(from_id) != sChatObjectAuth.end())
 			{
 				LLUUID key;
 				if (key.set(mesg.substr(3, 36),false))