diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index 9bd0986e3..306737fb7 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -501,9 +501,10 @@ BOOL LLTemplateMessageReader::decodeTemplate(
 	else
 	{
 		if(!custom) {
+			// MAINT-7482 - make viewer more tolerant of unknown messages.
 			LL_WARNS() << "Message #" << std::hex << num << std::dec
 					<< " received but not registered!" << LL_ENDL;
-			gMessageSystem->callExceptionFunc(MX_UNREGISTERED_MESSAGE);
+			//gMessageSystem->callExceptionFunc(MX_UNREGISTERED_MESSAGE);
 		}
 		return(FALSE);
 	}