diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index e3c61b4fe18..fc921dfb801 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -49,7 +49,7 @@ class EmojiPickerDropdown extends React.PureComponent {
     this.setState({active: true});
     if (!EmojiPicker) {
       this.setState({loading: true});
-      import('emojione-picker').then(TheEmojiPicker => {
+      import(/* webpackChunkName: "emojione_picker" */ 'emojione-picker').then(TheEmojiPicker => {
         EmojiPicker = TheEmojiPicker.default;
         this.setState({loading: false});
       }).catch(err => {
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 01c28e76851..be40726c6ea 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -18,13 +18,13 @@ const needsExtraPolyfills = !(
 // This avoids shipping them all the polyfills.
 if (needsBasePolyfills) {
   Promise.all([
-    import('../mastodon/base_polyfills'),
-    import('../mastodon/extra_polyfills'),
+    import(/* webpackChunkName: "base_polyfills" */ '../mastodon/base_polyfills'),
+    import(/* webpackChunkName: "extra_polyfills" */ '../mastodon/extra_polyfills'),
   ]).then(main).catch(e => {
     console.error(e); // eslint-disable-line no-console
   });
 } else if (needsExtraPolyfills) {
-  import('../mastodon/extra_polyfills').then(main).catch(e => {
+  import(/* webpackChunkName: "extra_polyfills" */ '../mastodon/extra_polyfills').then(main).catch(e => {
     console.error(e); // eslint-disable-line no-console
   });
 } else {