diff --git a/lib/replace_email_variables.rb b/lib/replace_email_variables.rb
index 392c585d..f09548f9 100644
--- a/lib/replace_email_variables.rb
+++ b/lib/replace_email_variables.rb
@@ -35,7 +35,9 @@ module ReplaceEmailVariables
     text = replace(text, TEMPLATE_NAME, html_escape:) do
       (submitter.template || submitter.submission.template || submitter.submission).name
     end
-    text = replace(text, SUBMISSION_NAME, html_escape:) { submitter.submission.name }
+    text = replace(text, SUBMISSION_NAME, html_escape:) do
+      submitter.submission.name.presence || submitter.submission.template&.name
+    end
     text = replace(text, TEMPLATE_ID, html_escape:) { submitter.template.id }
     text = replace(text, SUBMITTER_ID, html_escape:) { submitter.id }
     text = replace(text, SUBMITTER_SLUG, html_escape:) { submitter.slug }