diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 898be4a1b..d78c37115 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -636,12 +636,12 @@ export default {
         showTimeSlotQuestion() {
             if (
                 this.selectedDate &&
-                this.selectedDate.includes("mobile") &&
-                !this.isMobileSelected
+                this.appointmentTypeFromAppointmentTypeQuestion &&
+                this.timeSlotsForSelectedDate
             ) {
-                this.setSelectedDateToFirstAvailable();
+                return true;
             }
-            return this.selectedDate && this.appointmentTypeFromAppointmentTypeQuestion;
+            return false;
         },
         isMobileStaticRecalibrationApplicable() {
             return (
@@ -1572,12 +1572,12 @@ export default {
         },
         handleDateSelected(date) {
             const previousDate = this.selectedDate;
-            
+
             // check if date actually changed
             if (previousDate !== date.dateString) {
                 this.handleDateChanged({
                     newDate: date.dateString,
-                    oldDate: previousDate
+                    oldDate: previousDate,
                 });
             }
 
@@ -1877,7 +1877,6 @@ export default {
         textBlock,
         timeSlotQuestion,
         mobileFirstModal,
-
         alert,
         serviceZipModalQuestion,
         appointmentTypeQuestion,
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..3690370e0 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -190,14 +190,6 @@ export default {
         selectedRouteCodeData(newValue) {
             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();
-        },
     },
     computed: {
         supplementalInformationBlock() {