diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 95336ef45023586f33640e1ccc763b29f0e265bd..4b9dc01feb441fc6c3f0daf298751e66643757b3 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -74,6 +74,11 @@ class FanOutOnWriteService < BaseService
     status.tags.pluck(:name).each do |hashtag|
       Redis.current.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}", @payload)
       Redis.current.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}:local", @payload) if status.local?
+      List.where('title ILIKE ?', "%##{hashtag}%").select(:id).reorder(nil).find_in_batches do |lists|
+        FeedInsertWorker.push_bulk(lists) do |list|
+          [status.id, list.id, :list]
+        end
+      end
     end
   end