diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 09fd8d6d8..b362a9f74 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -714,7 +714,7 @@ export default {
             }
             if (monthToShow) {
                 // make new API call with this month's start and end dates
-                await this.updateSelectableDates(
+                const moreSelectableDatesData = await this.updateSelectableDates(
                     monthToShow.dates[monthStartDateNum].inputValue,
                     monthToShow.dates[monthToShow.dates.length - 1].inputValue
                 );
@@ -725,6 +725,8 @@ export default {
 
                 if (monthToShow.monthClass.includes("last-available-month"))
                     this.disableViewMoreDatesButton = true;
+
+                return moreSelectableDatesData;
             }
         },
         async updateSelectableDates(monthStart, monthEnd) {
@@ -749,6 +751,7 @@ export default {
                     });
                 });
             });
+            return moreSelectableDates;
         },
         scrollToElement(elementId, duration = 800, easing = "ease-in-out") {
             const wrapper = document.querySelector(".page-container-grouped-styles");
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 3cef3dff0..b1e04a734 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -373,7 +373,10 @@ export default {
                     this.selectedDate = selectableDatesData.days[0].date;
                 } else {
                     setTimeout(() => {
-                        this.$refs.datePicker.showAnotherMonth();
+                        this.$refs.datePicker.showAnotherMonth().then((moreSelectableDatesData) => {
+                            this.selectableDatesData = moreSelectableDatesData;
+                            this.setDisplayWaitList();
+                        });
                     }, 50);
                 }
             }