diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 36bc98bdb1e1a18cee0972225acc48eeb7fa1ecd..478827794ed5c26d74b33a69ca0cc4967eb03f4c 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -309,7 +309,7 @@ class MergeRequest < ActiveRecord::Base
     commits_for_notes_limit = 100
     commit_ids = commits.last(commits_for_notes_limit).map(&:id)
 
-    Note.where(
+    Note.includes(:award_emoji).where(
       "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
       "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
       mr_id: id,
diff --git a/app/models/note.rb b/app/models/note.rb
index 8d1646475500ae26c822e32089e3b3ea6dfb219d..4bc9d1a92f8205126d750ccf8ce492c9dcf864d4 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -54,7 +54,7 @@ class Note < ActiveRecord::Base
   scope :non_diff_notes, ->{ where(type: ['Note', nil]) }
 
   scope :with_associations, -> do
-    includes(:author, :noteable, :updated_by,
+    includes(:author, :noteable, :updated_by, :award_emoji,
              project: [:project_members, { group: [:group_members] }])
   end