diff --git a/lib/gamification_plugin.rb b/lib/gamification_plugin.rb
index 65c5574..f52a4d5 100644
--- a/lib/gamification_plugin.rb
+++ b/lib/gamification_plugin.rb
@@ -36,7 +36,7 @@ class GamificationPlugin < Noosfero::Plugin
   def body_ending
     proc do
       if current_person.present? && response.status == 200
-        badges = current_person.badges.notification_pending.all
+        badges = current_person.badges.notification_pending
         current_person.sash.notify_all_badges_from_user
         render :file => 'gamification/display_notifications', :locals => {:badges => badges}
       else
diff --git a/lib/gamification_plugin/badge.rb b/lib/gamification_plugin/badge.rb
index 2eeb0ce..b0e7c63 100644
--- a/lib/gamification_plugin/badge.rb
+++ b/lib/gamification_plugin/badge.rb
@@ -18,6 +18,6 @@ class GamificationPlugin::Badge < Noosfero::Plugin::ActiveRecord
     Merit::BadgesSash.where(:badge_id => self.id).destroy_all
   end
 
-  scope :notification_pending, :joins => :badges_sash, :conditions => ['badges_sashes.notified_user = false']
+  scope :notification_pending, :include => :badges_sash, :conditions => ['badges_sashes.notified_user = false']
 
 end
--
libgit2 0.21.2