diff --git a/app/models/status.rb b/app/models/status.rb
index 111172e9a..3f150c5de 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -86,7 +86,7 @@ class Status < ApplicationRecord
   end
 
   def self.as_public_timeline(account)
-    where.not(account_id: account.blocking).with_includes.with_counters
+    joins('LEFT JOIN statuses AS reblogs ON reblogs.id = statuses.reblog_of_id').where('reblogs.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?) AND statuses.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)', account.id, account.id).with_includes.with_counters
   end
 
   def self.favourites_map(status_ids, account_id)