diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index ab0d68275..86c738285 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -72,7 +72,7 @@ module Diaspora
       def posts_from(person)
         asp = Aspect.arel_table
         p = Post.arel_table
-        Post.includes(:aspects).where( p[:public].eq(true).or(asp[:user_id].eq(self.id))).order("posts.updated_at DESC")
+        person.posts.includes(:aspects).where( p[:public].eq(true).or(asp[:user_id].eq(self.id))).select('DISTINCT `posts`.*').order("posts.updated_at DESC")
       end
     end
   end