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 91301e329..b0a01da45 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -520,7 +520,7 @@ export default {
             };
         },
         setSelectedRouteCodeFromParent() {
-            if (!this.modelValue?.timeSlot) {
+            if (!this.modelValue?.timeSlot?.routeCode) {
                 return;
             }
             const routeCodeFromParent = this.modelValue.timeSlot.routeCode;
@@ -530,7 +530,7 @@ export default {
             } else {
                 if (this.isDropOffRouteCode(routeCodeFromParent)) {
                     this.selectedAnswerForDropOffOrInshop = routeCodeFromParent;
-                } else if (routeCodeFromParent) {
+                } else {
                     this.selectedAnswerForDropOffOrInshop = PICK_A_TIME_BUTTON_VALUE;
                     this.selectedAnswerForTimeSlots = routeCodeFromParent;
                 }