diff --git a/CRM/Event/Form/Registration/ThankYou.php b/CRM/Event/Form/Registration/ThankYou.php
index 3d1a8b16591b..694933d150ad 100644
--- a/CRM/Event/Form/Registration/ThankYou.php
+++ b/CRM/Event/Form/Registration/ThankYou.php
@@ -158,27 +158,30 @@ public function buildQuickForm() {
     $params['entity_table'] = 'civicrm_event';
 
     $data = [];
-    $friendURL = NULL;
+    $extensionText = [];
 
     if (function_exists('tellafriend_civicrm_config')) {
+      // @todo - move this to tellafriend extension
       CRM_Friend_BAO_Friend::retrieve($params, $data);
       if (!empty($data['is_active'])) {
         $friendText = $data['title'];
-        $this->assign('friendText', $friendText);
         if ($this->_action & CRM_Core_Action::PREVIEW) {
           $friendURL = CRM_Utils_System::url('civicrm/friend',
-            "eid={$this->_eventId}&reset=1&action=preview&pcomponent=event"
+            "eid={$this->getEventID()}&reset=1&action=preview&pcomponent=event"
           );
         }
         else {
           $friendURL = CRM_Utils_System::url('civicrm/friend',
-            "eid={$this->_eventId}&reset=1&pcomponent=event"
+            "eid={$this->getEventID()}&reset=1&pcomponent=event"
           );
         }
+        $extensionText[] = '"<div id="tell-a-friend" class="crm-section tell_friend_link-section">
+            <a href="' . $friendURL . '" title="' . htmlentities($friendText) . '" class="button"><span><i class="crm-i fa-chevron-right" aria-hidden="true"></i> ' .  CRM_Utils_String::purifyHTML($friendText) . '</span></a>
+       </div><br /><br />"';
       }
     }
 
-    $this->assign('friendURL', $friendURL);
+    $this->assign('extensionText', $extensionText);
     $this->assign('iCal', CRM_Event_BAO_Event::getICalLinks($this->_eventId));
     $this->assign('isShowICalIconsInline', TRUE);
 
diff --git a/templates/CRM/Event/Form/Registration/ThankYou.tpl b/templates/CRM/Event/Form/Registration/ThankYou.tpl
index c4251ad6fb99..951a78c4d303 100644
--- a/templates/CRM/Event/Form/Registration/ThankYou.tpl
+++ b/templates/CRM/Event/Form/Registration/ThankYou.tpl
@@ -22,11 +22,9 @@
     {/if}
 
     {* Show link to Tell a Friend (CRM-2153) *}
-    {if $friendText}
-        <div id="tell-a-friend" class="crm-section tell_friend_link-section">
-            <a href="{$friendURL}" title="{$friendText|escape:'html'}" class="button"><span><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {$friendText}</span></a>
-       </div><br /><br />
-    {/if}
+  {foreach from='extensionText' item='text'}
+    {$text}
+  {/foreach}
 
     {* Add button for donor to create their own Personal Campaign page *}
     {if $pcpLink}