diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index f07e8477f..7856f6edf 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -18,7 +18,8 @@ class NotificationsController < ApplicationController
   end
 
   def index
-    @notifications = Notification.for(current_user).include(:target).paginate :page => params[:page], :per_page => 25
+    @notifications = Notification.find(:all, :conditions => {:recipient_id => current_user.id},
+                                       :order => 'created_at desc', :include => [:target]).paginate :page => params[:page], :per_page => 25
     @group_days = @notifications.group_by{|note| note.created_at.strftime("%B %d") }
     respond_with @notifications
   end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 6f27a589d..113ebbf2f 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -11,7 +11,7 @@ class Notification < ActiveRecord::Base
   belongs_to :target, :polymorphic => true
 
   def self.for(recipient, opts={})
-    self.where(opts.merge!(:recipient_id => recipient.id)).order('created_at desc').include(:target)
+    self.where(opts.merge!(:recipient_id => recipient.id)).order('created_at desc')
   end
 
   def self.notify(recipient, target, actor)