diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 8b7f208115d..32236f20d90 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -557,7 +557,7 @@ class FeedManager arr = crutches[:active_mentions][s.id] || [] arr.push(s.account_id) - if s.reblog? + if s.reblog? && s.reblog.present? arr.push(s.reblog.account_id) arr.concat(crutches[:active_mentions][s.reblog_of_id] || []) end