diff --git a/CRM/Core/Form/Tag.php b/CRM/Core/Form/Tag.php
index 36c0946bfb24..ef8c89df4e50 100644
--- a/CRM/Core/Form/Tag.php
+++ b/CRM/Core/Form/Tag.php
@@ -26,7 +26,7 @@ class CRM_Core_Form_Tag {
    *
    * @param CRM_Core_Form $form
    *   Form object.
-   * @param string $parentNames
+   * @param array $parentNames
    *   Parent name ( tag name).
    * @param string $entityTable
    *   Entitytable 'eg: civicrm_contact'.
@@ -43,7 +43,7 @@ public static function buildQuickForm(
     &$form, $parentNames, $entityTable, $entityId = NULL, $skipTagCreate = FALSE,
     $skipEntityAction = FALSE, $tagsetElementName = NULL) {
     $tagset = $form->_entityTagValues = [];
-    $form->assign("isTagset", FALSE);
+    $form->assign('isTagset', FALSE);
     $mode = NULL;
 
     foreach ($parentNames as &$parentNameItem) {
@@ -96,8 +96,8 @@ public static function buildQuickForm(
         $tagsetInfo[$mode] = [];
       }
       $tagsetInfo[$mode] = array_merge($tagsetInfo[$mode], $tagset);
-      $form->assign("tagsetInfo", $tagsetInfo);
-      $form->assign("isTagset", TRUE);
+      $form->assign('tagsetInfo', $tagsetInfo);
+      $form->assign('isTagset', TRUE);
     }
   }
 
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 6be2f9672c42..03071003ce95 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -165,7 +165,7 @@
   </tr>
   {/if}
 
-  {if !empty($tagsetInfo.activity)}
+  {if $isTagset}
     <tr class="crm-activity-form-block-tag_set">
       {include file="CRM/common/Tagset.tpl" tagsetType='activity' tableLayout=true}
     </tr>