diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index ae2c4042c..3717248f7 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -127,9 +127,9 @@ export default {
     name: "schedule",
     data() {
         return {
-            selectedDate: null,
+            selectedDate: this.getSelectedDate(),
             selectedTimeSlotData: {
-                id: null,
+                id: this.getSelectedRouteCode(),
                 isPremiumAppointment: null,
             },
             selectableDatesData: [],
@@ -219,7 +219,7 @@ export default {
             if (this.selectedDate === null) {
                 return null;
             }
-            return this.selectableDatesData.days.find(
+            return this.selectableDatesData.days?.find(
                 (selectableDate) => selectableDate.dateString === this.selectedDate.dateString
             );
         },
@@ -230,6 +230,7 @@ export default {
             const timeSlotSelectedObject = this.getTimeSlotObjectFromTimeSlotId(
                 this.selectedTimeSlotData.id
             );
+
             if (timeSlotSelectedObject) {
                 return {
                     date: this.selectedDate.dateString,
@@ -277,6 +278,12 @@ export default {
             ).timeSlots;
             return timeSlots.find((timeSlot) => timeSlot.id === timeSlotId);
         },
+        getSelectedDate() {
+            return store.getters.order.schedule.date;
+        },
+        getSelectedRouteCode() {
+            return store.getters.order.schedule.routeCode;
+        },
         timeSlotModalClosed() {
             // Clear the selectedDate if no timeSlot has been selected
             if (!this.selectedTimeSlotData.id) {
@@ -344,7 +351,6 @@ export default {
                 this.appointmentDateAndTime,
                 false
             );
-
             navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
         },
     },
diff --git a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
index a622dd875..62d052941 100644
--- a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
+++ b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
@@ -157,9 +157,10 @@ export default {
             return false;
         },
         dateSelectedReadableDate() {
-            if (this.dateAndTimeSlotData === null) {
+            if (!this.dateAndTimeSlotData) {
                 return null;
             }
+
             // This conversion ensures we don't get get GMT induced date changes
             const dateObject = new Date(`${this.dateAndTimeSlotData.dateString}T00:00:00`);
             // Ex: Tuesday, April 22
@@ -170,7 +171,7 @@ export default {
             });
         },
         availableTimeSlots() {
-            if (this.dateAndTimeSlotData === null) {
+            if (!this.dateAndTimeSlotData) {
                 return null;
             }
             if (this.appointmentType === AppointmentTypeStrings.DROP_OFF) {