diff --git a/app/javascript/gabsocial/components/emoji/unicode_to_unified_name.js b/app/javascript/gabsocial/components/emoji/unicode_to_unified_name.js
index 808ac197..95921957 100644
--- a/app/javascript/gabsocial/components/emoji/unicode_to_unified_name.js
+++ b/app/javascript/gabsocial/components/emoji/unicode_to_unified_name.js
@@ -6,6 +6,7 @@ function padLeft(str, num) {
 }
 
 exports.unicodeToUnifiedName = (str) => {
+  if (!str) return '';
   let output = '';
   for (let i = 0; i < str.length; i += 2) {
     if (i > 0) {
diff --git a/config/webpack/production.js b/config/webpack/production.js
index 460be1d3..009f772d 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -81,8 +81,7 @@ module.exports = merge(sharedConfig, {
         ],
       },
       externals: [
-        '/emoji/1f602.svg', // used for emoji picker dropdown
-        '/emoji/sheet_10.png', // used in emoji-mart
+        '/emoji/sheet.png', // used in emoji-mart
       ],
       excludes: [
         '**/*.gz',