diff --git a/routes/_utils/removeEmoji.js b/routes/_utils/removeEmoji.js
index 080ccfdf..52971441 100644
--- a/routes/_utils/removeEmoji.js
+++ b/routes/_utils/removeEmoji.js
@@ -1,5 +1,5 @@
 import { replaceAll } from './strings'
-import emojiRegex from 'emoji-regex'
+import emojiRegex from 'emoji-regex/es2015/text.js'
 
 let theEmojiRegex
 
diff --git a/tests/spec/118-display-name-custom-emoji.js b/tests/spec/118-display-name-custom-emoji.js
index fa991331..2d6c43c5 100644
--- a/tests/spec/118-display-name-custom-emoji.js
+++ b/tests/spec/118-display-name-custom-emoji.js
@@ -106,3 +106,23 @@ test('Check status aria labels for de-emojified text', async t => {
     .click(displayNameInComposeBox)
     .expect(getNthStatus(0).getAttribute('aria-label')).eql('Status by 🌈 foo :blobpats: 🌈')
 })
+
+test('Check some odd emoji', async t => {
+  await updateUserDisplayNameAs('foobar', 'foo 🕹📺')
+  await sleep(1000)
+  await loginAsFoobar(t)
+  await t
+    .expect(displayNameInComposeBox.innerText).eql('foo 🕹📺')
+    .click(settingsNavButton)
+    .click(generalSettingsButton)
+    .click(removeEmojiFromDisplayNamesInput)
+    .expect(removeEmojiFromDisplayNamesInput.checked).ok()
+    .click(homeNavButton)
+    .expect(displayNameInComposeBox.innerText).eql('foo')
+    .click(settingsNavButton)
+    .click(generalSettingsButton)
+    .click(removeEmojiFromDisplayNamesInput)
+    .expect(removeEmojiFromDisplayNamesInput.checked).notOk()
+    .click(homeNavButton)
+    .expect(displayNameInComposeBox.innerText).eql('foo 🕹📺')
+})