1 files changed, 6 insertions, 1 deletions
diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx
index 6752b56cd..484164e56 100644
--- a/webapp/components/logged_in.jsx
+++ b/webapp/components/logged_in.jsx
@@ -156,6 +156,11 @@ export default class LoggedIn extends React.Component {
                 e.preventDefault();
             }
         });
+
+        // Get custom emoji from the server
+        if (window.mm_config.EnableCustomEmoji === 'true') {
+            AsyncClient.listEmoji();
+        }
     }
 
     componentWillUnmount() {
@@ -187,4 +192,4 @@ export default class LoggedIn extends React.Component {
 
 LoggedIn.propTypes = {
     children: React.PropTypes.object
-};
-\ No newline at end of file
+};