diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f937552..65cf3ad 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -791,7 +791,7 @@ module ApplicationHelper
             case prefix
             when nil
               if oid.to_s == identifier &&
-                    issue = Issue.visible.includes(:status).find_by_id(oid)
+                issue = Issue.visible.find_by_id(oid)
                 anchor = comment_id ? "note-#{comment_id}" : nil
                 link = link_to(h("##{oid}#{comment_suffix}"),
                                {:only_path => only_path, :controller => 'issues',
@@ -810,7 +810,7 @@ module ApplicationHelper
                                                 :class => 'version'
               end
             when 'message'
-              if message = Message.visible.includes(:parent).find_by_id(oid)
+              if message = Message.visible.find_by_id(oid)
                 link = link_to_message(message, {:only_path => only_path}, :class => 'message')
               end
             when 'forum'