diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 0299fdf7d..bba78ceb7 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -140,7 +140,7 @@ class FilesController < ApplicationController
   def public_with_course_and_project
     @attachments = Attachment.publiced.simple_columns
                        .contains_course_and_project
-                       .includes(:author => :user_extension)
+                       .includes(:container, author: :user_extension)
                        .by_filename_or_user_name(params[:search])
                        .ordered(sort: 0, sort_type: 'created_on')