diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 3c37adde5..23671a356 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1663,6 +1663,7 @@ export default {
                 this.appointmentType = null;
             }
             this.selectedDate = this.getSelectedDate();
+            this.setDisplayWaitList();
         },
     },
     watch: {
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 82d94d76f..58a193d2a 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -54,7 +54,10 @@
                 v-model="waitListRequested"
                 @click="waitListChecked" />
         </div>
-        <div v-if="waitListRequested" class="rounded waitlist-success" ref="waitlistSuccessMessage">
+        <div
+            v-if="waitListRequested && displayWaitList"
+            class="rounded waitlist-success"
+            ref="waitlistSuccessMessage">
             <img :src="waitListSuccessImage" class="success-image" />
             <span v-html="waitListSuccessText" class="success-text"></span>
         </div>