diff --git a/components/Calendar.vue b/components/Calendar.vue
index 7e102830c..a8beb1257 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -81,10 +81,8 @@ export default Vue.extend({
             document.addEventListener('click', this.documentClicked);
         }
     },
-    destroyed() {
-        if (process.client) {
-            document.removeEventListener('click', this.documentClicked);
-        }
+    unmounted() {
+        document.removeEventListener('click', this.documentClicked);
     },
     methods: {
         getDayClass(d: Day): string {
diff --git a/components/Dropdown.vue b/components/Dropdown.vue
index 275a42b2a..1bffb3072 100644
--- a/components/Dropdown.vue
+++ b/components/Dropdown.vue
@@ -35,10 +35,8 @@ export default {
             document.addEventListener('click', this.documentClicked);
         }
     },
-    destroyed() {
-        if (process.client) {
-            document.removeEventListener('click', this.documentClicked);
-        }
+    unmounted() {
+        document.removeEventListener('click', this.documentClicked);
     },
     methods: {
         documentClicked() {
diff --git a/components/Header.vue b/components/Header.vue
index 67e503b73..b497c2631 100644
--- a/components/Header.vue
+++ b/components/Header.vue
@@ -443,11 +443,9 @@ export default {
             window.addEventListener('scroll', this.updateShown);
         }
     },
-    destroyed() {
-        if (process.client) {
-            document.removeEventListener('click', this.documentClicked);
-            document.removeEventListener('scroll', this.updateShown);
-        }
+    unmounted() {
+        document.removeEventListener('click', this.documentClicked);
+        document.removeEventListener('scroll', this.updateShown);
     },
     methods: {
         isActiveRoute(link) {
diff --git a/components/Popover.vue b/components/Popover.vue
index 5602480ff..da624df7e 100644
--- a/components/Popover.vue
+++ b/components/Popover.vue
@@ -108,7 +108,7 @@ export default Vue.extend({
             };
         },
     },
-    beforeDestroy() {
+    beforeUnmount() {
         this.hide();
     },
     methods: {
diff --git a/components/ScrollButton.vue b/components/ScrollButton.vue
index 171fe0149..b481eb144 100644
--- a/components/ScrollButton.vue
+++ b/components/ScrollButton.vue
@@ -26,10 +26,8 @@ export default {
             window.addEventListener('scroll', this.updateShown);
         }
     },
-    destroyed() {
-        if (process.client) {
-            document.removeEventListener('scroll', this.updateShown);
-        }
+    unmounted() {
+        document.removeEventListener('scroll', this.updateShown);
     },
     methods: {
         scroll() {