diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 2069347da..36d9877da 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -258,6 +258,9 @@ export default {
 				this.modalEvent.closeFn();
 		}
 	},
+	beforeUnmount() {
+		this.hideEventModal();
+	},
 	template: /* html */`
 	<div class="fhc-calendar-base h-100">
 		<base-draganddrop