diff --git a/src/components/input/datepicker.vue b/src/components/input/datepicker.vue
index f5aa3247b..932c77bc9 100644
--- a/src/components/input/datepicker.vue
+++ b/src/components/input/datepicker.vue
@@ -153,7 +153,7 @@ export default {
 	mounted() {
 		document.addEventListener('click', this.hideDatePopup)
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		document.removeEventListener('click', this.hideDatePopup)
 	},
 	watch: {
diff --git a/src/components/input/multiselect.vue b/src/components/input/multiselect.vue
index 03a839d48..45ab76bc3 100644
--- a/src/components/input/multiselect.vue
+++ b/src/components/input/multiselect.vue
@@ -191,7 +191,7 @@ export default {
 	mounted() {
 		document.addEventListener('click', this.hideSearchResultsHandler)
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		document.removeEventListener('click', this.hideSearchResultsHandler)
 	},
 	watch: {
diff --git a/src/components/list/partials/filter-popup.vue b/src/components/list/partials/filter-popup.vue
index 011b5912a..6caf6d1dc 100644
--- a/src/components/list/partials/filter-popup.vue
+++ b/src/components/list/partials/filter-popup.vue
@@ -27,7 +27,7 @@ export default {
 	mounted() {
 		document.addEventListener('click', this.hidePopup)
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		document.removeEventListener('click', this.hidePopup)
 	},
 	watch: {
diff --git a/src/components/misc/dropdown.vue b/src/components/misc/dropdown.vue
index c56f14fdb..4bd2c6b2b 100644
--- a/src/components/misc/dropdown.vue
+++ b/src/components/misc/dropdown.vue
@@ -28,7 +28,7 @@ export default {
 	mounted() {
 		document.addEventListener('click', this.hide)
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		document.removeEventListener('click', this.hide)
 	},
 	props: {
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index c66c0793b..0fb3d4c67 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -72,7 +72,7 @@ export default {
 		document.addEventListener('click', this.hidePopup)
 		this.interval = setInterval(this.loadNotifications, LOAD_NOTIFICATIONS_INTERVAL)
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		document.removeEventListener('click', this.hidePopup)
 		clearInterval(this.interval)
 	},
diff --git a/src/components/tasks/partials/defer-task.vue b/src/components/tasks/partials/defer-task.vue
index 3620697a3..4f17bf790 100644
--- a/src/components/tasks/partials/defer-task.vue
+++ b/src/components/tasks/partials/defer-task.vue
@@ -83,7 +83,7 @@ export default {
 
 		this.changeInterval = setInterval(this.updateDueDate, 1000)
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.changeInterval) {
 			clearInterval(this.changeInterval)
 		}
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index 40ac483ab..e435a0bf4 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -149,7 +149,7 @@ export default {
 		this.task = this.theTask
 		document.addEventListener('click', this.hideDeferDueDatePopup)
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		document.removeEventListener('click', this.hideDeferDueDatePopup)
 	},
 	computed: {