diff --git a/lib/replace_email_variables.rb b/lib/replace_email_variables.rb
index b142b569..5c721cf8 100644
--- a/lib/replace_email_variables.rb
+++ b/lib/replace_email_variables.rb
@@ -33,7 +33,7 @@ module ReplaceEmailVariables
   end
 
   def build_documents_links_text(submitter)
-    submitter.documents.map do |document|
+    Submitters.select_attachments_for_download(submitter).map do |document|
       link =
         Rails.application.routes.url_helpers.rails_blob_url(
           document, **Docuseal.default_url_options
diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb
index e99e5abb..6b634886 100644
--- a/lib/submissions/generate_audit_trail.rb
+++ b/lib/submissions/generate_audit_trail.rb
@@ -92,7 +92,7 @@ module Submissions
       documents_data = Submitters.select_attachments_for_download(last_submitter).map do |document|
         original_documents = submission.template.documents.select { |e| e.uuid == document.uuid }.presence
         original_documents ||= submission.template.documents.select do |e|
-          e.image? && submission.schema.any? do |item|
+          e.image? && submission.template_schema.any? do |item|
             item['attachment_uuid'] == e.uuid
           end
         end