diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 93151c1f4..20c09d663 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1187,8 +1187,8 @@ export default {
             }
             this.initializeDatePicker().then(() => {
                 this.showMobileFirstModal();
+                this.hideLoadingModal();
                 this.calendarLoadingStatus = "none";
-                this.$refs.datePicker.isLoading = false;
                 this.setSelectedDateToFirstAvailable();
             });
         },
@@ -1780,6 +1780,7 @@ export default {
                 this.selectedDate = null;
                 this.initializeDatePicker().then(() => {
                     this.showMobileFirstModal();
+                    this.hideLoadingModal();
                     this.calendarLoadingStatus = "none";
                 });
             });