diff --git a/CRM/Case/BAO/Query.php b/CRM/Case/BAO/Query.php
index c2855f7b9446..e56ec4663fa5 100644
--- a/CRM/Case/BAO/Query.php
+++ b/CRM/Case/BAO/Query.php
@@ -676,7 +676,8 @@ public static function getSearchFieldMetadata() {
    *
    * @param CRM_Case_Form_Search $form
    */
-  public static function buildSearchForm(&$form) {
+  public static function buildSearchForm(&$form): void {
+    $form->addOptionalQuickFormElement('upcoming');
     //validate case configuration.
     $configured = CRM_Case_BAO_Case::isCaseConfigured();
     $form->assign('notConfigured', !$configured['configured']);
diff --git a/templates/CRM/Case/Form/CaseFilter.tpl b/templates/CRM/Case/Form/CaseFilter.tpl
index 4b425c00e10e..c078bcee54e1 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 && isset($form.upcoming)}
+          {if $accessAllCases && $form.upcoming}
             <td class="crm-case-dashboard-switch-view-buttons">
               <br/>
               {$form.upcoming.html}&nbsp;{$form.upcoming.label}