diff --git a/lib/submitters/serialize_for_webhook.rb b/lib/submitters/serialize_for_webhook.rb
index 6ee2f7f9..3d35fa97 100644
--- a/lib/submitters/serialize_for_webhook.rb
+++ b/lib/submitters/serialize_for_webhook.rb
@@ -24,8 +24,8 @@ module Submitters
     end
 
     def build_values_array(submitter)
-      fields_index = (submitter.submission.template_fields ||
-                      submitter.submission.template.fields).index_by { |e| e['uuid'] }
+      fields_index = (submitter.submission.template.fields +
+                      submitter.submission.template_fields.to_a).index_by { |e| e['uuid'] }
       attachments_index = submitter.attachments.index_by(&:uuid)
       submitter_field_counters = Hash.new { 0 }