diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue
index 2d9d700343..1d860ff545 100644
--- a/src/client/app/common/views/components/autocomplete.vue
+++ b/src/client/app/common/views/components/autocomplete.vue
@@ -44,8 +44,9 @@ const lib = Object.entries(emojilib.lib).filter((x: any) => {
 });
 
 const char2file = (char: string) => {
-	let codes = [...char].map(x => x.codePointAt(0).toString(16));
+	let codes = Array.from(char).map(x => x.codePointAt(0).toString(16));
 	if (!codes.includes('200d')) codes = codes.filter(x => x != 'fe0f');
+	codes = codes.filter(x => x && x.length);
 	return codes.join('-');
 };
 
diff --git a/src/client/app/common/views/components/emoji.vue b/src/client/app/common/views/components/emoji.vue
index 4ea2ea941c..29b09947e4 100644
--- a/src/client/app/common/views/components/emoji.vue
+++ b/src/client/app/common/views/components/emoji.vue
@@ -66,8 +66,9 @@ export default Vue.extend({
 		}
 
 		if (this.char) {
-			let codes = [...this.char].map(x => x.codePointAt(0).toString(16));
+			let codes = Array.from(this.char).map(x => x.codePointAt(0).toString(16));
 			if (!codes.includes('200d')) codes = codes.filter(x => x != 'fe0f');
+			codes = codes.filter(x => x && x.length);
 
 			this.url = `https://twemoji.maxcdn.com/2/svg/${codes.join('-')}.svg`;
 		}