diff --git a/src/first-message-highlighter/index.js b/src/first-message-highlighter/index.js
index b749a20a..faad4241 100644
--- a/src/first-message-highlighter/index.js
+++ b/src/first-message-highlighter/index.js
@@ -179,9 +179,9 @@ class FirstMessageHighlight extends Addon {
 			}
 		});
 
-		this.chat.addHighlightReason('first-message', "First message from a user during this session");
-		this.chat.addHighlightReason('first-time-chatter', "First messages from a user new to the channel");
-		this.chat.addHighlightReason('returning-chatter', "First messages from a user returning to the channel");
+		this.chat.addHighlightReason('first-message', 'First message from a user during this session');
+		this.chat.addHighlightReason('first-time-chatter', 'First messages from a user new to the channel');
+		this.chat.addHighlightReason('returning-chatter', 'First messages from a user returning to the channel');
 
 		const outerThis = this;
 		this.messageHighlighter = {
@@ -259,6 +259,8 @@ class FirstMessageHighlight extends Addon {
 	}
 
 	highlightMessage(ctx, msg) {
+		if (!this.settings.get('first_message_highlight.enabled')) return;
+
 		if (this.settings.get('first_message_highlight.only_moderated_channels')) {
 			if (!this.chat.context.get('context.moderator'))
 				return;
diff --git a/src/first-message-highlighter/manifest.json b/src/first-message-highlighter/manifest.json
index 712d4d83..5649793a 100644
--- a/src/first-message-highlighter/manifest.json
+++ b/src/first-message-highlighter/manifest.json
@@ -1,7 +1,7 @@
 {
 	"enabled": true,
 	"requires": [],
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"icon": "https://i.imgur.com/Db2zP1l.png",
 	"short_name": "first_msg_highlight",
 	"name": "First Message Highlight",
@@ -9,5 +9,5 @@
 	"description": "Addon to highlight the first message of a user during the current session. Useful for community-driven chats and welcoming.",
 	"settings": "add_ons.first_message_highlight",
 	"created": "2021-12-01T14:32:46.254Z",
-	"updated": "2024-01-16T20:13:28.279Z"
+	"updated": "2024-01-16T20:17:22.813Z"
 }
\ No newline at end of file