diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index c822a3ea3..ab9e08177 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1176,8 +1176,8 @@ export default {
 
             if (!this.selectedDate) {
                 // if no date is preselected on load, then select the first available
-                const selectedDateMobile = this.getSelectedDateForMobile();
-                const selectedDateInshop = this.getSelectedDateForInshop();
+                let selectedDateMobile = this.getSelectedDateForMobile();
+                let selectedDateInshop = this.getSelectedDateForInshop();
 
                 // if there is still no selected date, then load more and try again
                 if (
@@ -1195,6 +1195,13 @@ export default {
                             // > Doing so will likely add or remove dates,
                             // > desyncing the schedule page and the date-picker.
 
+                            if (!selectedDateInshop) {
+                                selectedDateInshop = this.getSelectedDateForInshop();
+                            }
+                            if (!selectedDateMobile) {
+                                selectedDateMobile = this.getSelectedDateForMobile();
+                            }
+
                             this.setDisplayWaitList();
                         });
                     });