diff --git a/app/jobs/govbox/submit_message_draft_job.rb b/app/jobs/govbox/submit_message_draft_job.rb
index 0c55e5507..4a491d5f0 100644
--- a/app/jobs/govbox/submit_message_draft_job.rb
+++ b/app/jobs/govbox/submit_message_draft_job.rb
@@ -8,10 +8,12 @@ class TemporarySubmissionError < SubmissionError
   retry_on TemporarySubmissionError, wait: 2.minutes, attempts: 5
 
   def perform(message_draft, schedule_sync: true, upvs_client: UpvsEnvironment.upvs_client)
+    all_message_metadata = message_draft.metadata.merge(message_draft.template&.metadata)
+
     message_draft_data = {
-      posp_id: message_draft.all_metadata["posp_id"],
-      posp_version: message_draft.all_metadata["posp_version"],
-      message_type: message_draft.all_metadata["message_type"],
+      posp_id: all_message_metadata["posp_id"],
+      posp_version: all_message_metadata["posp_version"],
+      message_type: all_message_metadata["message_type"],
       message_id: message_draft.uuid,
       correlation_id: message_draft.metadata["correlation_id"],
       recipient_uri: message_draft.metadata["recipient_uri"],
diff --git a/app/models/message_draft.rb b/app/models/message_draft.rb
index dd41b2469..9ae685603 100644
--- a/app/models/message_draft.rb
+++ b/app/models/message_draft.rb
@@ -116,10 +116,6 @@ def template_validation_errors
     template&.message_data_validation_errors(self)
   end
 
-  def all_metadata
-    metadata.merge(template&.metadata)
-  end
-
   private
 
   def validate_with_message_template
@@ -127,7 +123,7 @@ def validate_with_message_template
   end
 
   def validate_metadata
-    all_message_metadata = all_metadata
+    all_message_metadata = metadata.merge(template&.metadata)
 
     errors.add(:metadata, "No recipient URI") unless all_message_metadata["recipient_uri"].present?
     errors.add(:metadata, "No posp ID") unless all_message_metadata["posp_id"].present?