diff --git a/lib/submissions/generate_preview_attachments.rb b/lib/submissions/generate_preview_attachments.rb
index b2c9ea27..94c836c3 100644
--- a/lib/submissions/generate_preview_attachments.rb
+++ b/lib/submissions/generate_preview_attachments.rb
@@ -28,7 +28,7 @@ module Submissions
       original_documents = template.documents.preload(:blob)
 
       result_attachments =
-        submission.template_schema.map do |item|
+        (submission.template_schema || template.schema).map do |item|
           pdf = pdfs_index[item['attachment_uuid']]
 
           if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
diff --git a/lib/submissions/generate_result_attachments.rb b/lib/submissions/generate_result_attachments.rb
index 1bcd7a53..f1ef7fb7 100644
--- a/lib/submissions/generate_result_attachments.rb
+++ b/lib/submissions/generate_result_attachments.rb
@@ -140,8 +140,6 @@ module Submissions
       end
 
       fill_submitter_fields(submitter, submitter.account, pdfs_index, with_signature_id:, is_flatten:)
-
-      pdfs_index
     end
 
     def fill_submitter_fields(submitter, account, pdfs_index, with_signature_id:, is_flatten:)
@@ -149,6 +147,8 @@ module Submissions
 
       attachments_data_cache = {}
 
+      return pdfs_index if submitter.submission.template_fields.blank?
+
       submitter.submission.template_fields.each do |field|
         next if field['submitter_uuid'] != submitter.uuid
 
@@ -446,6 +446,8 @@ module Submissions
           end
         end
       end
+
+      pdfs_index
     end
 
     def build_pdf_attachment(pdf:, submitter:, pkcs:, tsa_url:, uuid:, name:)