diff --git a/src/sites/twitch-twilight/modules/video_chat/index.jsx b/src/sites/twitch-twilight/modules/video_chat/index.jsx
index 8030cbec..71c91820 100644
--- a/src/sites/twitch-twilight/modules/video_chat/index.jsx
+++ b/src/sites/twitch-twilight/modules/video_chat/index.jsx
@@ -533,7 +533,7 @@ export default class VideoChatHook extends Module {
 		if ( comment._ffz_message )
 			return comment._ffz_message;
 
-		const room = this.active_room || this.chat.getRoom(comment.channelId, null, true, true),
+		const room = this.chat.getRoom(this.channelId, null, true, true),
 			params = comment.message.userNoticeParams,
 			msg_id = params && params['msg-id'];
 
@@ -548,7 +548,7 @@ export default class VideoChatHook extends Module {
 				type: author.type
 			},
 			roomLogin: room && room.login,
-			roomID: room && room.id || comment.channelId,
+			roomID: room && room.id,
 			ffz_badges: this.chat.badges.getBadges(author.id, author.login, room?.id, room?.login),
 			badges: comment.userBadges,
 			messageParts: comment.message.tokens,
@@ -628,6 +628,8 @@ export default class VideoChatHook extends Module {
 
 		this.updateRoomBadges(chat, get('data.video.owner.broadcastBadges', props));
 		this.updateRoomBitsConfig(chat, props.bitsConfig);
+
+		this.channelId = props.data.video.owner.id;
 	}