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