diff --git a/src/modules/chat/emoji.js b/src/modules/chat/emoji.js
index f8520c0c..76546934 100644
--- a/src/modules/chat/emoji.js
+++ b/src/modules/chat/emoji.js
@@ -47,6 +47,8 @@ export const SKIN_TONES = {
 	4: '1f3fe',
 	5: '1f3ff'
 };
+export const JOINER_REPLACEMENT = /(?<!\u{E0002})\u{E0002}/gu;
+export const EMOJI_JOINER = '\u{E0002}';
 
 export const IMAGE_PATHS = {
 	google: 'noto',
diff --git a/src/modules/chat/tokenizers.jsx b/src/modules/chat/tokenizers.jsx
index b92af34e..9ccf7ede 100644
--- a/src/modules/chat/tokenizers.jsx
+++ b/src/modules/chat/tokenizers.jsx
@@ -8,7 +8,7 @@ import {sanitize, createElement} from 'utilities/dom';
 import {has, getTwitchEmoteURL, split_chars, getTwitchEmoteSrcSet} from 'utilities/object';
 
 import {EmoteTypes, REPLACEMENT_BASE, REPLACEMENTS} from 'utilities/constants';
-import {CATEGORIES} from './emoji';
+import {CATEGORIES, JOINER_REPLACEMENT} from './emoji';
 
 
 const EMOTE_CLASS = 'chat-image chat-line__message--emote',
@@ -1547,7 +1547,7 @@ export const Emoji = {
 				continue;
 			}
 
-			const text = token.text;
+			const text = token.text.replace(JOINER_REPLACEMENT, "\u200d");
 
 			splitter.lastIndex = 0;
 			let idx = 0, match;
diff --git a/src/sites/twitch-twilight/modules/chat/input.jsx b/src/sites/twitch-twilight/modules/chat/input.jsx
index ee046641..359256f4 100644
--- a/src/sites/twitch-twilight/modules/chat/input.jsx
+++ b/src/sites/twitch-twilight/modules/chat/input.jsx
@@ -12,6 +12,8 @@ import { TWITCH_POINTS_SETS, TWITCH_GLOBAL_SETS, TWITCH_PRIME_SETS, KNOWN_CODES,
 
 import Twilight from 'site';
 
+import {EMOJI_JOINER} from 'src/modules/chat/emoji';
+
 // Prefer using these statically-allocated collators to String.localeCompare
 const locale = Intl.Collator();
 const localeCaseInsensitive = Intl.Collator(undefined, {sensitivity: 'accent'});
@@ -55,7 +57,6 @@ function getNodeOffset(nodes, path) {
 	return offset;
 }
 
-
 export default class Input extends Module {
 	constructor(...args) {
 		super(...args);
@@ -508,6 +509,9 @@ export default class Input extends Module {
 				t.log.error(err);
 			}
 
+			// replace ZERO WIDTH JOINER with custom joiner so combined emoji work
+			inst.autocompleteInputRef.setValue(inst.chatInputRef.value.replace('\u{200d}', EMOJI_JOINER));
+
 			originalOnMessageSend.call(this, event);
 		}
 	}