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 97b334821..3c83bd039 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -192,6 +192,9 @@ export default {
                 this.appointmentType === AppointmentTypeStrings.IN_SHOP ||
                 this.appointmentType === AppointmentTypeStrings.DROP_OFF
             ) {
+                if (!this.selectedAnswerForTimeSlots && !this.selectedAnswerForDropOffOrInshop) {
+                    this.autoSelectTimeSlotIfOnlyOneIsAvailable();
+                }
                 return null;
                 // This is planned to be used again for drop-off
                 // Wrote this to be ready for that eventuality, is untested and no HTML work done yet
@@ -399,6 +402,8 @@ export default {
             this.setSelectedRouteCodeFromParent();
         },
         async setSelectedTimeSlot() {
+            this.selectedRouteCode =
+                this.selectedAnswerForTimeSlots || this.selectedAnswerForDropOffOrInshop;
             this.$emit(
                 "update:modelValue",
                 this.getSelectedTimeSlotInfoObject(this.selectedRouteCode)
@@ -488,12 +493,13 @@ export default {
         },
         autoSelectTimeSlotIfOnlyOneIsAvailable() {
             const numberOfOptions = this.timeSlotsForSelectedDate?.timeSlots?.length;
-            if (numberOfOptions === 1) {
+            if (this.appointmentType && numberOfOptions === 1) {
                 if (this.availableTimeSlots.length > 0) {
                     this.selectedAnswerForTimeSlots = this.availableTimeSlots[0].value;
                 } else {
                     this.selectedAnswerForDropOffOrInshop = this.answersForDropOffQuestion[0].value;
                 }
+                this.setSelectedTimeSlot();
             }
         },
         addPremiumFlagToInput(routeCode) {