diff --git a/app/jobs/unqueue_message_job.rb b/app/jobs/unqueue_message_job.rb
index df2af6d..a382222 100644
--- a/app/jobs/unqueue_message_job.rb
+++ b/app/jobs/unqueue_message_job.rb
@@ -292,6 +292,12 @@ class UnqueueMessageJob < Postal::Job
                 next
               end
 
+              # Extract a tag and add it to the message if one doesn't exist
+              if queued_message.message.tag.nil? && tag = queued_message.message.headers["x-postal-tag"]
+                log "#{log_prefix} Added tag #{tag.last}"
+                queued_message.message.update(tag: tag.last)
+              end
+
               #
               # If the credentials for this message is marked as holding and this isn't manual, hold it
               #
@@ -312,12 +318,6 @@ class UnqueueMessageJob < Postal::Job
                 next
               end
 
-              # Extract a tag and add it to the message if one doesn't exist
-              if queued_message.message.tag.nil? && tag = queued_message.message.headers["x-postal-tag"]
-                log "#{log_prefix} Added tag #{tag.last}"
-                queued_message.message.update(tag: tag.last)
-              end
-
               # Parse the content of the message as appropriate
               if queued_message.message.should_parse?
                 log "#{log_prefix} Parsing message content as it hasn't been parsed before"