diff --git a/package.json b/package.json
index ca40720c17..6aacc406d2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "BetterTTV",
   "author": "Night",
-  "version": "7.0.28",
+  "version": "7.0.29",
   "description": "BetterTTV enhances Twitch with new features, bug fixes, and reduced clutter.",
   "main": "betterttv.js",
   "scripts": {
diff --git a/src/modules/chat/index.js b/src/modules/chat/index.js
index 403ed7bd6c..9f14f109ca 100644
--- a/src/modules/chat/index.js
+++ b/src/modules/chat/index.js
@@ -130,7 +130,7 @@ class ChatModule {
         const tokens = $message.contents();
         for (let i = 0; i < tokens.length; i++) {
             const node = tokens[i];
-            if (node.nodeType === window.Node.ELEMENT_NODE && node.classList.contains('balloon-wrapper')) {
+            if (node.nodeType === window.Node.ELEMENT_NODE && (node.classList.contains('balloon-wrapper') || node.classList.contains('tw-tooltip-wrapper'))) {
                 const $emote = $(node);
                 const $image = $emote.find('img');
                 if (!$image.length) continue;
@@ -138,7 +138,7 @@ class ChatModule {
                 const id = ($image.attr('src').split('emoticons/v1/')[1] || '').split('/')[0];
                 const emote = channelEmotesTip.getEmote(id, code);
                 if (emote) {
-                    $emote.find('.balloon').css('text-align', 'center').html(emote.balloon);
+                    $emote.find('.balloon,.tw-tooltip').css('text-align', 'center').html(emote.balloon);
                     if (!currentChannel || emote.channel.name === currentChannel.name) continue;
                     $emote.on('click', () => window.open(emote.channel.url, '_blank'));
                 }
diff --git a/src/modules/vod_chat/index.js b/src/modules/vod_chat/index.js
index 7072902597..debcfed4f8 100644
--- a/src/modules/vod_chat/index.js
+++ b/src/modules/vod_chat/index.js
@@ -2,7 +2,7 @@ const $ = require('jquery');
 const chat = require('../chat');
 const watcher = require('../../watcher');
 
-const CHAT_MESSAGE_SELECTOR = '.vod-message__message,.qa-mod-message span';
+const CHAT_MESSAGE_SELECTOR = '.vod-message__message,.qa-mod-message';
 const CHAT_USERNAME_SELECTOR = '.vod-message__author,.video-chat__message-author';
 const SCROLL_INDICATOR_SELECTOR = '.vod-chat__sync-button,.video-chat__sync-button';
 const SCROLL_CONTAINER_SELECTOR = '.vod-chat__scroll-wrapper,.video-chat__message-list-wrapper';
diff --git a/src/watcher.js b/src/watcher.js
index f28b602385..73a4373e1d 100644
--- a/src/watcher.js
+++ b/src/watcher.js
@@ -287,7 +287,7 @@ class Watcher extends SafeEventEmitter {
                 for (const el of mutation.addedNodes) {
                     const $el = $(el);
 
-                    const $chatContents = $el.find('.vod-message__content,.video-chat__message');
+                    const $chatContents = $el.find('.vod-message__content,.vod-message');
 
                     for (const chatContent of $chatContents) {
                         this.emit('vod.message', $(chatContent));