diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index 0852bfdc..34629cf1 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -74,6 +74,7 @@
     <div class="hidden md:block relative w-80 flex-none pt-0.5 pr-4 pl-0.5 overflow-auto space">
       <% colors = %w[bg-red-500 bg-sky-500 bg-emerald-500 bg-yellow-300 bg-purple-600 bg-pink-500 bg-cyan-500 bg-orange-500 bg-lime-500 bg-indigo-500] %>
       <% submitter_fields_index = (@submission.template_fields || @submission.template.fields).group_by { |f| f['submitter_uuid'] } %>
+      <% submitter_field_counters = Hash.new { 0 } %>
       <% (@submission.template_submitters || @submission.template.submitters).each_with_index do |item, index| %>
         <% submitter = @submission.submitters.find { |e| e.uuid == item['uuid'] } %>
         <div class="sticky -top-1 bg-base-100 pt-1 -mt-1 z-10">
@@ -132,7 +133,6 @@
           </div>
         </div>
         <div class="px-1.5 mb-4">
-          <% submitter_field_counters = Hash.new { 0 } %>
           <% submitter_fields_index[item['uuid']].to_a.each_with_index do |field, index| %>
             <% submitter_field_counters[field['type']] += 1 %>
             <% value = values[field['uuid']] %>
diff --git a/lib/submitters/serialize_for_webhook.rb b/lib/submitters/serialize_for_webhook.rb
index 9852f3b9..baa32561 100644
--- a/lib/submitters/serialize_for_webhook.rb
+++ b/lib/submitters/serialize_for_webhook.rb
@@ -25,19 +25,21 @@ module Submitters
     end
 
     def build_values_array(submitter)
-      fields_index = (submitter.submission.template.fields +
-                      submitter.submission.template_fields.to_a).index_by { |e| e['uuid'] }
+      fields = submitter.submission.template_fields.presence || submitter.submission.template.fields
       attachments_index = submitter.attachments.index_by(&:uuid)
       submitter_field_counters = Hash.new { 0 }
 
-      submitter.values.map do |uuid, value|
-        field = fields_index[uuid]
+      fields.filter_map do |field|
         submitter_field_counters[field['type']] += 1
 
+        next if field['submitter_uuid'] != submitter.uuid
+
         field_name =
           field['name'].presence || "#{field['type'].titleize} Field #{submitter_field_counters[field['type']]}"
 
-        value = fetch_field_value(field, value, attachments_index)
+        next if !submitter.values.key?(field['uuid']) && !submitter.completed_at?
+
+        value = fetch_field_value(field, submitter.values[field['uuid']], attachments_index)
 
         { field: field_name, value: }
       end