diff --git a/package.json b/package.json
index 75f2c95d..75e351af 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "frankerfacez",
   "author": "Dan Salvato LLC",
-  "version": "4.24.0",
+  "version": "4.24.1",
   "description": "FrankerFaceZ is a Twitch enhancement suite.",
   "private": true,
   "license": "Apache-2.0",
diff --git a/src/sites/twitch-twilight/modules/chat/emote_menu.jsx b/src/sites/twitch-twilight/modules/chat/emote_menu.jsx
index 8cafb5c4..ce3fdc49 100644
--- a/src/sites/twitch-twilight/modules/chat/emote_menu.jsx
+++ b/src/sites/twitch-twilight/modules/chat/emote_menu.jsx
@@ -344,7 +344,8 @@ export default class EmoteMenu extends Module {
 
 		this.EmoteMenu = this.fine.define(
 			'chat-emote-menu',
-			n => n.subscriptionProductHasEmotes,
+			n => n.getAllEmoteSets && n.getSortedChannelEmotes && n.props?.emotePickerSource,
+			//n => n.subscriptionProductHasEmotes,
 			Twilight.CHAT_ROUTES
 		)
 
@@ -410,13 +411,12 @@ export default class EmoteMenu extends Module {
 			const old_render = cls.prototype.render;
 
 			cls.prototype.render = function() {
-				if ( ! this.props || ! has(this.props, 'channelOwnerID') || ! t.chat.context.get('chat.emote-menu.enabled') ) {
-					this._ffz_no_scan = false;
+				this._ffz_no_scan = false;
+
+				if ( ! this.props || ! has(this.props, 'channelID') || ! t.chat.context.get('chat.emote-menu.enabled') ) {
 					return old_render.call(this);
 				}
 
-				this._ffz_no_scan = true;
-
 				return (<t.MenuErrorWrapper visible={this.props.visible}>
 					<t.MenuComponent
 						source={this.props.emotePickerSource}
@@ -425,9 +425,9 @@ export default class EmoteMenu extends Module {
 						channel_data={this.props.channelData}
 						emote_data={this.props.emoteSetsData}
 						user_id={this.props.currentUserID}
-						channel_id={this.props.channelOwnerID}
-						loading={this.state.gqlLoading}
-						error={this.state.gqlError}
+						channel_id={this.props.channelID}
+						loading={this.props.channelData?.loading || this.props.emoteSetsData?.loading}
+						error={this.props.channelData?.error || this.props.emoteSetsData?.error}
 						onClickToken={this.props.onClickToken}
 					/>
 				</t.MenuErrorWrapper>)