diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index c6ba967710b..6e6df035983 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -16,7 +16,7 @@ class FeedManager
   end
 
   def push(timeline_type, account, status)
-    redis.zadd(key(timeline_type, account.id), status.id, status.id)
+    redis.zadd(key(timeline_type, account.id), status.id, status.reblog? ? status.reblog_of_id : status.id)
     trim(timeline_type, account.id)
     broadcast(account.id, type: 'update', timeline: timeline_type, message: inline_render(account, status))
   end
diff --git a/app/models/feed.rb b/app/models/feed.rb
index 5807ff1768e..e1c915c093c 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -6,14 +6,14 @@ class Feed
 
   def get(limit, max_id = nil)
     max_id     = '+inf' if max_id.nil?
-    unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", '-inf', limit: [0, limit])
+    unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", '-inf', limit: [0, limit], with_scores: true).collect(&:last).map(&:to_i)
     status_map = {}
 
     # If we're after most recent items and none are there, we need to precompute the feed
     if unhydrated.empty? && max_id == '+inf'
       PrecomputeFeedService.new.call(@type, @account, limit)
     else
-      Status.where(id: unhydrated).with_includes.with_counters.each { |status| status_map[status.id.to_s] = status }
+      Status.where(id: unhydrated).with_includes.with_counters.each { |status| status_map[status.id] = status }
       unhydrated.map { |id| status_map[id] }.compact
     end
   end