diff --git a/client/js/lounge.js b/client/js/lounge.js
index c303e53f..3106e094 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -760,6 +760,10 @@ $(function() {
 	});
 
 	chat.on("msg", ".messages", function(e, target, msg) {
+		if (msg.self) {
+			return;
+		}
+
 		var button = sidebar.find(".chan[data-target='" + target + "']");
 		var isQuery = button.hasClass("query");
 		if (msg.type === "invite" || msg.highlight || isQuery || (options.notifyAllMessages && msg.type === "message")) {
diff --git a/src/plugins/irc-events/message.js b/src/plugins/irc-events/message.js
index 1181030c..3d18cff3 100644
--- a/src/plugins/irc-events/message.js
+++ b/src/plugins/irc-events/message.js
@@ -64,7 +64,7 @@ module.exports = function(irc, network) {
 			return (w.replace(/^@/, "").toLowerCase().indexOf(irc.user.nick.toLowerCase()) === 0);
 		});
 
-		if (chan.id !== client.activeChannel) {
+		if (!self && chan.id !== client.activeChannel) {
 			chan.unread++;
 
 			if (highlight) {