diff --git a/app/models/user.rb b/app/models/user.rb
index 5656978d..c9ce8be3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -122,7 +122,7 @@ class User < ActiveRecord::Base
   end
 
   def feed
-    microposts
+    Micropost.where("micropostable_id IN (?) OR micropostable_id = ?", following_ids, id)
   end
 
 end