diff --git a/app/models/journal.rb b/app/models/journal.rb
index 919a07dd2..a4efcdbee 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -142,7 +142,8 @@ class Journal < ActiveRecord::Base
   end
 
   def attachments
-    details.select{ |d| d.property == 'attachment' }.map{ |d| Attachment.find_by(:id => d.prop_key) }.compact
+    ids = details.select {|d| d.property == 'attachment' && d.value.present?}.map(&:prop_key)
+    Attachment.where(id: ids).to_a
   end
 
   # Returns a string of css classes