diff --git a/app/models/status.rb b/app/models/status.rb
index d60f833064..069a1b423e 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -410,6 +410,8 @@ class Status < ApplicationRecord
         end
 
         public_emoji_reactions
+      else
+        emoji_reactions
       end
     end
   end
diff --git a/app/services/un_emoji_react_service.rb b/app/services/un_emoji_react_service.rb
index 400efda19a..9dadfad68b 100644
--- a/app/services/un_emoji_react_service.rb
+++ b/app/services/un_emoji_react_service.rb
@@ -42,8 +42,8 @@ class UnEmojiReactService < BaseService
   end
 
   def write_stream(emoji_reaction)
-    emoji_group = @status.emoji_reactions_grouped_by_name
-                         .find { |reaction_group| reaction_group['name'] == emoji_reaction.name && (!reaction_group.key?(:domain) || reaction_group['domain'] == emoji_reaction.custom_emoji&.domain) }
+    emoji_group = @status.emoji_reactions_grouped_by_name(@account)
+                         .find { |reaction_group| reaction_group['name'] == emoji_reaction.name }
     if emoji_group
       emoji_group['status_id'] = @status.id.to_s
     else
@@ -51,6 +51,7 @@ class UnEmojiReactService < BaseService
       emoji_group = { 'name' => emoji_reaction.name, 'count' => 0, 'account_ids' => [], 'status_id' => @status.id.to_s }
       emoji_group['domain'] = emoji_reaction.custom_emoji.domain if emoji_reaction.custom_emoji
     end
+
     DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @status.id, emoji_reaction.account_id)
   end