diff --git a/lib/replace_email_variables.rb b/lib/replace_email_variables.rb
index 894c355c..ac7732ae 100644
--- a/lib/replace_email_variables.rb
+++ b/lib/replace_email_variables.rb
@@ -84,7 +84,7 @@ module ReplaceEmailVariables
     value = submitter.try(field_name)
 
     if value_name
-      field = submission.template_fields.find { |e| e['name'] == value_name }
+      field = (submission.template_fields || submission.template.fields).find { |e| e['name'] == value_name }
 
       return unless field