diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index c4d566ae7..48424f085 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -98,11 +98,11 @@
                     linkWidgetName="ServiceZipLinkWidget"
                     modalWidgetName="ServiceZipModalWidget" />
             </div>
-            <div class="row your-shop-location" v-if="showInshopComponent">
+            <div class="row your-shop-location" v-if="showShopLocationComponent">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <div>
                         <shopLocation
-                            v-if="showInshopComponent"
+                            v-if="showShopLocationComponent"
                             :selectedShop="selectedShopAnswer"
                             :selectedProviderNumberFromParent="selectedProvider?.providerNumber"
                             :shopProviderDataFromParent="shopProviderData"
@@ -633,19 +633,18 @@ export default {
                 this.handleZipCodeChange(newValue);
             },
         },
-        showInshopComponent() {
+        showShopLocationComponent() {
             // If we get no inshop or mobile data, then show the shoplocation component so the user is not
             // looking at a half blank screen with no way to try another zip/location.
             if (
-                (this.inshopTimeSlotsData === undefined &&
-                    this.mobileTimeSlotsData === undefined) ||
-                (this.inshopTimeSlotsData.days.length === 0 &&
-                    this.mobileTimeSlotsData.days.length === 0) ||
+                (this.selectableDatesInshop === undefined &&
+                    this.selectableDatesMobile === undefined) ||
+                (this.selectableDatesInshop?.days?.length === 0 &&
+                    this.selectableDatesMobile?.days?.length === 0) ||
                 (this.appointmentType && this.appointmentType !== AppointmentTypeStrings.MOBILE)
             ) {
                 return true;
             }
-
             return false;
         },
         isMobileSelected() {
@@ -1844,7 +1843,6 @@ export default {
                 this.appointmentType = null;
             }
             this.setSelectedDateToFirstAvailable(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
-            this.setDisplayWaitList(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
         },
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();