diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index d44c535137..fd80327833 100644
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -213,7 +213,8 @@ export function emojiReact(status, emoji) {
 
     const api_emoji = typeof emoji !== 'string' ? (emoji.custom ? (emoji.name + (emoji.domain || '')) : emoji.native) : emoji;
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/emoji_reactions`, { emoji: api_emoji }).then(function () {
+    api(getState).post(`/api/v1/statuses/${status.get('id')}/emoji_reactions`, { emoji: api_emoji }).then(function (response) {
+      dispatch(importFetchedStatus(response.data));
       dispatch(emojiReactSuccess(status, emoji));
     }).catch(function (error) {
       dispatch(emojiReactFail(status, emoji, error));
@@ -226,6 +227,8 @@ export function unEmojiReact(status, emoji) {
     dispatch(unEmojiReactRequest(status, emoji));
 
     api(getState).post(`/api/v1/statuses/${status.get('id')}/emoji_unreaction`, { emoji }).then(() => {
+      // TODO: do not update because this api has a bug
+      // dispatch(importFetchedStatus(response.data));
       dispatch(unEmojiReactSuccess(status, emoji));
     }).catch(error => {
       dispatch(unEmojiReactFail(status, emoji, error));
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index 8ae030fe52..21b60acd4d 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -283,14 +283,18 @@ class DetailedStatus extends ImmutablePureComponent {
       emojiReactionsLink = (
         <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/emoji_reactions`} className='detailed-status__link'>
           <Icon id='smile-o' />
-          <FormattedMessage id='status.emoji' defaultMessage='Emoji' />
+          <span className='detailed-status__favorites'>
+            <AnimatedNumber value={status.get('emoji_reactions_count')} />
+          </span>
         </Link>
       );
     } else {
       emojiReactionsLink = (
         <a href={`/interact/${status.get('id')}?type=emoji_reactions`} className='detailed-status__link' onClick={this.handleModalLink}>
           <Icon id='smile-o' />
-          <FormattedMessage id='status.emoji' defaultMessage='Emoji' />
+          <span className='detailed-status__favorites'>
+            <AnimatedNumber value={status.get('emoji_reactions_count')} />
+          </span>
         </a>
       );
     }