diff --git a/lib/submitters/serialize_for_webhook.rb b/lib/submitters/serialize_for_webhook.rb
index 9e897ef3..614cca2c 100644
--- a/lib/submitters/serialize_for_webhook.rb
+++ b/lib/submitters/serialize_for_webhook.rb
@@ -46,7 +46,7 @@ module Submitters
     end
 
     def build_values_array(submitter)
-      fields = submitter.submission.template_fields.presence || submitter.submission.template.fields
+      fields = submitter.submission.template_fields.presence || submitter.submission&.template&.fields || []
       attachments_index = submitter.attachments.index_by(&:uuid)
       submitter_field_counters = Hash.new { 0 }
 
@@ -68,7 +68,7 @@ module Submitters
     end
 
     def build_fields_array(submitter)
-      fields = submitter.submission.template_fields.presence || submitter.submission.template.fields
+      fields = submitter.submission.template_fields.presence || submitter.submission&.template&.fields || []
       attachments_index = submitter.attachments.index_by(&:uuid)
       submitter_field_counters = Hash.new { 0 }