diff --git a/client/js/lounge.js b/client/js/lounge.js
index 694cf59e..a567efef 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -222,7 +222,7 @@ $(function() {
 		var chan = chat.find(target);
 		var msg;
 
-		if (highlights.some(function(h) {
+		if (!data.msg.highlight && !data.msg.self && (type === "message" || type === "notice") && highlights.some(function(h) {
 			return data.msg.text.indexOf(h) > -1;
 		})) {
 			data.msg.highlight = true;