diff --git a/lib/Cron/Workers/SendingQueue/SendingQueue.php b/lib/Cron/Workers/SendingQueue/SendingQueue.php
index 6082a946d0..1e0520ab64 100644
--- a/lib/Cron/Workers/SendingQueue/SendingQueue.php
+++ b/lib/Cron/Workers/SendingQueue/SendingQueue.php
@@ -103,9 +103,6 @@ class SendingQueue {
           $subscriber,
           $queue
         );
-      if(!$queue->newsletter_rendered_subject) {
-        $queue->newsletter_rendered_subject = $prepared_newsletters[0]['subject'];
-      }
       // format subscriber name/address according to mailer settings
       $prepared_subscribers[] = $this->mailer_task->prepareSubscriberForSending(
         $subscriber
diff --git a/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php b/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
index 290d7410fa..e2ff187a8c 100644
--- a/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
+++ b/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
@@ -85,6 +85,7 @@ class Newsletter {
     // extract and save newsletter posts
     PostsTask::extractAndSave($rendered_newsletter, $newsletter);
     // update queue with the rendered and pre-processed newsletter
+    $queue->newsletter_rendered_subject = Shortcodes::process($newsletter->subject, $newsletter, null, $queue);
     $queue->newsletter_rendered_body = $rendered_newsletter;
     $queue->save();
     return $newsletter;