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 bb72c35ba..f35300f1a 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -440,7 +440,6 @@ export default {
                 "update:modelValue",
                 this.getSelectedTimeSlotInfoObject(this.selectedRouteCode)
             );
-            this.$emit("TimeSlotSelected");
         },
         getRelevantDropOffCmsWidgetNameForSelectedTimeSlot(
             selectedRouteCode,
@@ -503,7 +502,7 @@ export default {
             };
         },
         setSelectedRouteCodeFromParent() {
-            if (!this.modelValue?.timeSlot) {
+            if (!this.modelValue?.timeSlot?.routeCode) {
                 return;
             }
             const routeCodeFromParent = this.modelValue.timeSlot.routeCode;