diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 1a41eb9e9a..c85b0170fd 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -89,7 +89,15 @@ class Trends::Statuses < Trends::Base
   private
 
   def eligible?(status)
-    status.created_at.past? && status.public_visibility? && status.account.discoverable? && !status.account.silenced? && !status.account.sensitized? && status.spoiler_text.blank? && !status.sensitive? && !status.reply? && valid_locale?(status.language)
+    status.created_at.past? &&
+      status.public_visibility? &&
+      status.account.discoverable? &&
+      !status.account.silenced? &&
+      !status.account.sensitized? &&
+      status.spoiler_text.blank? &&
+      !status.sensitive? &&
+      !status.reply? &&
+      valid_locale?(status.language)
   end
 
   def calculate_scores(statuses, at_time)
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 2de9cd250f..1b9d051b38 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -15,6 +15,7 @@ class SuspendAccountService < BaseService
     unmerge_from_home_timelines!
     unmerge_from_list_timelines!
     privatize_media_attachments!
+    remove_from_trends!
   end
 
   private
@@ -101,6 +102,10 @@ class SuspendAccountService < BaseService
     end
   end
 
+  def remove_from_trends!
+    StatusTrend.where(account: @account).delete_all
+  end
+
   def signed_activity_json
     @signed_activity_json ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account))
   end