diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 07cd12b5e..b43087bff 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1,5 +1,5 @@
 <template>
-    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
         <loadingModal ref="loadingModal" />
         <div class="container-fluid page-container-grouped-styles page-schedule">
             <div class="row justify-content-center">
@@ -147,7 +147,7 @@
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
-                        :isForwardActionDisabled="!meta.valid || isForwardActionDisabled"
+                        :isForwardActionDisabled="isForwardActionDisabled"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -743,17 +743,7 @@ export default {
             return store.getters.order.policy.isNoComp;
         },
         isForwardActionDisabled() {
-            if (
-                (this.appointmentType === AppointmentTypeStrings.IN_SHOP ||
-                    this.appointmentType === AppointmentTypeStrings.DROP_OFF) &&
-                !this.selectedTimeSlotInfo?.timeSlot?.date
-            ) {
-                return true;
-            }
-            return (
-                this.displayNoShopsAlert ||
-                this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF
-            );
+            return !this.selectedTimeSlotInfo?.timeSlot?.routeCode || !this.appointmentType;
         },
         additionalButtonData() {
             return {