diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 17814e7fec99..b07b082865d3 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -21,7 +21,7 @@ class CRM_Report_Form extends CRM_Core_Form {
    *
    * @var string[]
    */
-  public $expectedSmartyVariables = ['pager', 'skip', 'sections', 'grandStat', 'chartEnabled', 'uniqueId', 'rows'];
+  public $expectedSmartyVariables = ['pager', 'skip', 'sections', 'grandStat', 'chartEnabled', 'uniqueId', 'rows', 'group_bys_freq'];
 
   /**
    * Deprecated constant, Reports should be updated to use the getRowCount function.
diff --git a/templates/CRM/Report/Form/Tabs/GroupBy.tpl b/templates/CRM/Report/Form/Tabs/GroupBy.tpl
index c53b7f579ff1..4e5a7e2d1ef1 100644
--- a/templates/CRM/Report/Form/Tabs/GroupBy.tpl
+++ b/templates/CRM/Report/Form/Tabs/GroupBy.tpl
@@ -15,7 +15,7 @@
         {assign var="count" value=`$count+1`}
         <td width="25%">
           {$form.group_bys[$gbElem].html}
-          {if $form.group_bys_freq[$gbElem].html}:<br>
+          {if $form.group_bys_freq && array_key_exists($gbElem, $form.group_bys_freq)}:<br>
             &nbsp;&nbsp;{$form.group_bys_freq[$gbElem].label}&nbsp;{$form.group_bys_freq[$gbElem].html}
           {/if}
         </td>