1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 8a37c7695..c4d57c34b 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -35,7 +35,7 @@ class FanOutOnWriteService < BaseService
     return if !status.public_visibility? || (status.reply? && status.in_reply_to_account_id != status.account_id)
 
     deliver_to_media(status) if status.media_attachments.any?
-    deliver_to_public(status) if status.local?
+    deliver_to_public(status, true)
   end
 
   private
@@ -88,7 +88,7 @@ class FanOutOnWriteService < BaseService
     end
   end
 
-  def deliver_to_public(status)
+  def deliver_to_public(status, tavern = false)
     key = "timeline:public:#{status.id}"
     return if Redis.current.get(key)
 
@@ -96,7 +96,7 @@ class FanOutOnWriteService < BaseService
 
     Redis.current.set(key, 1, ex: 6.hours)
 
-    Redis.current.publish('timeline:public', @payload)
+    Redis.current.publish('timeline:public', @payload) if status.local? || !tavern
     if status.local?
       Redis.current.publish('timeline:public:local', @payload)
     else