diff --git a/.common/utils/helpers.js b/.common/utils/helpers.js
index a6925f5..3998ca6 100644
--- a/.common/utils/helpers.js
+++ b/.common/utils/helpers.js
@@ -325,7 +325,7 @@ function RandomHex(str) {
 }
 
 // Used to construct a message from "parts" variable commonly found in Streamer.bot chat messages
-function ConstructMessageFromParts(parts) {
+function ConstructMessageFromParts(parts, isHorizontalChat = false) {
     return parts.map(part => {
         if (part.emoji)
             return ` <img src="${EscapeHTML(part.image)}" alt="${EscapeHTML(part.text)}" title="${EscapeHTML(part.text)}" class="emote"> `;
@@ -358,7 +358,10 @@ function ConstructMessageFromParts(parts) {
             case "mention":
                 return part.text;
             case "gif":
-                return `<img src="${EscapeHTML(part.url)}" class="gif">`;
+                if (!isHorizontalChat)
+                    return `<img src="${EscapeHTML(part.url)}" class="gif">`;
+                else
+                    return `<img src="${EscapeHTML(part.url)}" class="emote">`;
             default:
                 return `<img src="${EscapeHTML(part.imageUrl)}" alt="${EscapeHTML(part.text)}" title="${EscapeHTML(part.text)}" class="emote">`;
         }
diff --git a/horizontal-chat/script.js b/horizontal-chat/script.js
index 5c71c63..a709951 100644
--- a/horizontal-chat/script.js
+++ b/horizontal-chat/script.js
@@ -588,7 +588,7 @@ async function TwitchChatMessage(data) {
 	}
 
 	// Set the message data
-	let message = ConstructMessageFromParts(data.parts);
+	let message = ConstructMessageFromParts(data.parts, isHorizontalChat = true);
 	const messageColor = data.user.color;
 	const role = data.user.role;
 
@@ -693,7 +693,7 @@ async function TwitchAnnouncement(data) {
 			break;
 	}
 
-	let message = ConstructMessageFromParts(data.parts);
+	let message = ConstructMessageFromParts(data.parts, isHorizontalChat = true);
 
 	ShowAlert(message, background);
 }
@@ -949,7 +949,7 @@ function YouTubeMessage(data) {
 
 	// Set the message data
 	//let message = RenderMessageWithEmotesHTML(data.message, data.emotes);
-	let message = ConstructMessageFromParts(data.parts);
+	let message = ConstructMessageFromParts(data.parts, isHorizontalChat = true);
 	
 	// Set furry mode
 	if (furryMode)
@@ -1394,7 +1394,7 @@ async function KickChatMessage(data) {
 	}
 
 	// Set the message data
-	let message = ConstructMessageFromParts(data.parts);
+	let message = ConstructMessageFromParts(data.parts, isHorizontalChat = true);
 
 	// Set furry mode
 	if (furryMode)