diff --git a/src/common/outbound.c b/src/common/outbound.c
index b3b4ce90..a6aadd3b 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -3025,7 +3025,7 @@ cmd_msg (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 									  newsess->server->nick, msg + offset, TRUE, FALSE,
 									  &no_tags);
 			}
-			else
+			else if (!sess->server->have_echo_message)
 			{
 				/* mask out passwords */
 				if (g_ascii_strcasecmp (nick, "nickserv") == 0)