diff --git a/package.json b/package.json
index bb24d11f1a..6597d86da8 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     "cssnano": "^4.1.10",
     "detect-passive-events": "^2.0.0",
     "dotenv": "^8.0.0",
+    "emoji-datasource": "^6.0.1",
     "emoji-mart": "https://gitlab.com/seanking2919/emoji-mart#build",
     "es6-symbol": "^3.1.1",
     "escape-html": "^1.0.3",
diff --git a/webpack/shared.js b/webpack/shared.js
index 3c16b2b89f..2feeec89ec 100644
Binary files a/webpack/shared.js and b/webpack/shared.js differ
diff --git a/yarn.lock b/yarn.lock
index fa83f32bf0..f7022bc748 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4537,6 +4537,11 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
+emoji-datasource@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-6.0.1.tgz#0fd25101104cf16ddf36819237f4f174ec85a01f"
+  integrity sha512-kvkqTjdeXhVKwT2242jGhK18EpevORCTTBETDhByWOEVGwn5X+W5jvBioo+wrAnR7inUzydJ4gKUU5SQGjUG6A==
+
 "emoji-mart@https://gitlab.com/seanking2919/emoji-mart#build":
   version "2.6.3"
   resolved "https://gitlab.com/seanking2919/emoji-mart#4bdefa3d3ee7eb58716adc8727f688facc557291"