diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 654c7b01a..1ebf47c7e 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -167,7 +167,6 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
-                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -476,7 +475,6 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
-            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1136,6 +1134,29 @@ export default {
                 );
             }
         },
+        getTimeSlotInfo() {
+            // Get the current date
+            const currentDate = getTodayDate();
+
+            // Add 10 days to the current date
+            currentDate.setDate(currentDate.getDate() + 10);
+
+            // Format the date as yyyy-mm-dd
+            const year = currentDate.getFullYear();
+            const month = String(currentDate.getMonth() + 1).padStart(2, "0");
+            const day = String(currentDate.getDate()).padStart(2, "0");
+
+            const formattedDate = `${year}-${month}-${day}`;
+
+            return {
+                date: formattedDate,
+                endTime: "12:00",
+                jobMaxMinutes: "180",
+                jobMinMinutes: "120",
+                routeCode: "3357I-03357-M-I*20988*AM",
+                startTime: "08:00",
+            };
+        },
         onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;
@@ -1230,8 +1251,6 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
-            await this.$nextTick();
-            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
@@ -1884,10 +1903,6 @@ export default {
             },
         },
         selectedDate(newValue, oldValue) {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls selectedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
-
             // Clear time slot selection if date selected changes
             const selectedDate = this.getSelectedDateFromStore();
             if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index d2e43054c..1b8a2cb2e 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="time-slots-question">
         <buttonQuestion
-            ref="chooseDropOffOrInshop"
             v-if="isDropOffAppointmentAvailable"
             v-model="selectedAnswerForDropOffOrInshop"
             @update:modelValue="dropOffSelectionChanged"
@@ -24,9 +23,8 @@
             </div>
         </buttonQuestion>
         <buttonQuestion
-            ref="chooseTimeSlot"
-            v-if="displayTimeSlotQuestion"
-            v-model="selectedAnswerForTimeSlots"
+            ref="buttonQuestion"
+            v-if="shouldDisplayTimeSlotQuestion"
             @update:modelValue="timeSlotSelectionChanged"
             buttonTypeString="timeSlotModalListButton"
             :buttonTypeObject="timeSlotModalListButton"
@@ -36,12 +34,10 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{
-                isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots,
-                amountToLoad: 10,
-            }"
+            :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
+            v-model="selectedAnswerForTimeSlots"
             questionText="Available times:"
             isRequired
             validationRules="time-slot-required" />
@@ -137,7 +133,6 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
-        isDatePickerDoneInitializing: Boolean,
     },
     data() {
         return {
@@ -191,9 +186,6 @@ export default {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
         timeSlotsForSelectedDate() {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();
@@ -397,7 +389,7 @@ export default {
                 this.answersForDropOffQuestion[0].value !== PICK_A_TIME_BUTTON_VALUE
             );
         },
-        displayTimeSlotQuestion() {
+        shouldDisplayTimeSlotQuestion() {
             return (
                 this.selectedAnswerForDropOffOrInshop == PICK_A_TIME_BUTTON_VALUE ||
                 !this.isDropOffAppointmentAvailable