diff --git a/lib/Cron/Workers/SendingQueue.php b/lib/Cron/Workers/SendingQueue.php
index 0299f769c3..31327d8c29 100644
--- a/lib/Cron/Workers/SendingQueue.php
+++ b/lib/Cron/Workers/SendingQueue.php
@@ -55,7 +55,7 @@ class SendingQueue {
     $rendered_newsletter = $this->renderNewsletter($newsletter);
     $shortcodes = new Shortcodes($rendered_newsletter['html'], $newsletter, $subscriber);
     $processed_newsletter['html'] = $shortcodes->replace();
-    $shortcodes->rendered_newsletter = $rendered_newsletter['text'];
+    $shortcodes = new Shortcodes($rendered_newsletter['text'], $newsletter, $subscriber);
     $processed_newsletter['text'] = $shortcodes->replace();
     return $processed_newsletter;
   }
diff --git a/lib/Router/Newsletters.php b/lib/Router/Newsletters.php
index f976694dd3..1ae84d51ad 100644
--- a/lib/Router/Newsletters.php
+++ b/lib/Router/Newsletters.php
@@ -248,7 +248,10 @@ class Newsletters {
       $newsletter
     );
     $processed_newsletter['html'] = $shortcodes->replace();
-    $shortcodes->rendered_newsletter = $rendered_newsletter['text'];
+    $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
+      $rendered_newsletter['text'],
+      $newsletter
+    );
     $processed_newsletter['text'] = $shortcodes->replace();
     $newsletter['body'] = array(
       'html' => $processed_newsletter['html'],