diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb
index 2173824..f709832 100644
--- a/app/helpers/attachments_helper.rb
+++ b/app/helpers/attachments_helper.rb
@@ -34,7 +34,12 @@ module AttachmentsHelper
   def link_to_attachments(container, options = {})
     options.assert_valid_keys(:author, :thumbnails)
 
-    attachments = container.attachments.preload(:author).to_a
+    attachments = if container.attachments.loaded?
+      container.attachments
+    else
+      container.attachments.preload(:author).to_a
+    end
+
     if attachments.any?
       options = {
         :editable => container.attachments_editable?,