diff --git a/lib/submitters/normalize_values.rb b/lib/submitters/normalize_values.rb
index 4cdf5e4b..0c2ee8f2 100644
--- a/lib/submitters/normalize_values.rb
+++ b/lib/submitters/normalize_values.rb
@@ -94,7 +94,7 @@ module Submitters
     end
 
     def fetch_fields(template, submitter_name: nil, for_submitter: nil)
-      if submitter_name
+      if submitter_name && !for_submitter
         submitter =
           template.submitters.find { |e| e['name'] == submitter_name } ||
           raise(UnknownSubmitterName,