diff --git a/templates/CRM/Case/Form/CaseFilter.tpl b/templates/CRM/Case/Form/CaseFilter.tpl
index c078bcee54e1..4b425c00e10e 100644
--- a/templates/CRM/Case/Form/CaseFilter.tpl
+++ b/templates/CRM/Case/Form/CaseFilter.tpl
@@ -21,7 +21,7 @@
           <td class="crm-contact-form-block-case_status_id crm-inline-edit-field">
             {$form.case_status_id.label}<br /> {$form.case_status_id.html}
           </td>
-          {if $accessAllCases && $form.upcoming}
+          {if $accessAllCases && isset($form.upcoming)}
             <td class="crm-case-dashboard-switch-view-buttons">
               <br/>
               {$form.upcoming.html}&nbsp;{$form.upcoming.label}
diff --git a/templates/CRM/Case/Page/DashBoard.tpl b/templates/CRM/Case/Page/DashBoard.tpl
index f8bcfce4db50..41f19e33f408 100644
--- a/templates/CRM/Case/Page/DashBoard.tpl
+++ b/templates/CRM/Case/Page/DashBoard.tpl
@@ -56,7 +56,7 @@
           {foreach from=$casesSummary.headers item=header}
             {assign var="caseStatus" value=$header.status}
             <td class="label">
-              {if $row.$caseStatus}
+              {if isset($row.$caseStatus)}
                 <a class="crm-case-summary-drilldown" href="{$row.$caseStatus.url}">{$row.$caseStatus.count}</a>
               {else}
                 0