diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 2226c3bf3..6e6664ca1 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -89,7 +89,7 @@ export default {
             document.getElementById(this.modalId)?.focus();
         },
         resetButtonStyle() {
-            this.$refs.modalButtonMain.resetButtonStyle();
+            this.$refs.modalButtonMain?.resetButtonStyle();
         },
         onModalOpened() {
             this.onModalOpenedCallback?.();
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index e2acb9d15..c2fee87ee 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -498,13 +498,6 @@ export default {
             this.updateFooterButtonText(newValue);
         },
     },
-    unmounted() {
-        // remove modal backdrop if one exists
-        let modalBackground = document.querySelector(".modal-backdrop");
-        if (modalBackground) {
-            modalBackground.remove();
-        }
-    },
     components: {
         funnelHeader,
         navbar,
diff --git a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
index 148a70767..d04621894 100644
--- a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
+++ b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
@@ -494,6 +494,9 @@ export default {
             };
         },
     },
+    unmounted() {
+        if (this.isModalOpened) this.closeModal();
+    },
     watch: {
         modelValue: {
             handler(newValue) {