diff --git a/zerver/lib/events.py b/zerver/lib/events.py
index ee38d0189f..94a2dcec2e 100644
--- a/zerver/lib/events.py
+++ b/zerver/lib/events.py
@@ -159,6 +159,7 @@ def fetch_initial_state_data(user_profile, event_types, queue_id,
         state['left_side_userlist'] = user_profile.left_side_userlist
         state['emoji_alt_code'] = user_profile.emoji_alt_code
         state['emojiset'] = user_profile.emojiset
+        state['emojiset_choices'] = user_profile.emojiset_choices()
         state['timezone'] = user_profile.timezone
         state['default_language'] = user_profile.default_language
 
diff --git a/zerver/views/home.py b/zerver/views/home.py
index 80065b05da..f4aaeb1846 100644
--- a/zerver/views/home.py
+++ b/zerver/views/home.py
@@ -223,7 +223,6 @@ def home_real(request):
         avatar_source         = user_profile.avatar_source,
         timezone              = user_profile.timezone,
         emojiset              = user_profile.emojiset,
-        emojiset_choices      = user_profile.emojiset_choices(),
 
         # Stream message notification settings:
         stream_desktop_notifications_enabled = user_profile.enable_stream_desktop_notifications,
@@ -266,6 +265,7 @@ def home_real(request):
         'attachments',
         'default_language',
         'emoji_alt_code',
+        'emojiset_choices',
         'hotspots',
         'last_event_id',
         'left_side_userlist',