diff --git a/webapp/components/FilterMenu/EventsByFilter.vue b/webapp/components/FilterMenu/EventsByFilter.vue
index 3d0531e51..f29c5eb81 100644
--- a/webapp/components/FilterMenu/EventsByFilter.vue
+++ b/webapp/components/FilterMenu/EventsByFilter.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
+import { mapGetters, mapMutations } from 'vuex'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
 
@@ -36,12 +36,19 @@ export default {
     FilterMenuSection,
     LabeledButton,
   },
-  mixins: [FilterMenuMixin],
   computed: {
+    ...mapGetters({
+      eventsEnded: 'posts/eventsEnded',
+    }),
     sectionTitle() {
       // return $t('filter-menu.eventsEnded')
       return null
     },
   },
+  methods: {
+    ...mapMutations({
+      toggleEventsEnded: 'posts/TOGGLE_EVENTS_ENDED',
+    }),
+  },
 }
 </script>
diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index 9c59770ae..2d7aefc48 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -9,7 +9,6 @@ export default {
       articleSetInPostTypeFilter: 'posts/articleSetInPostTypeFilter',
       eventSetInPostTypeFilter: 'posts/eventSetInPostTypeFilter',
       orderedByCreationDate: 'posts/orderedByCreationDate',
-      eventsEnded: 'posts/eventsEnded',
       orderBy: 'posts/orderBy',
     }),
   },
@@ -18,7 +17,6 @@ export default {
       toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
       toggleUnsetAllPostTypeFilters: 'posts/TOGGLE_UNSET_ALL_POST_TYPES_FILTERS',
       toggleSetUnsetPostTypeFilter: 'posts/TOGGLE_SET_UNSET_POST_TYPE_FILTER',
-      toggleEventsEnded: 'posts/TOGGLE_EVENTS_ENDED',
       toggleOrder: 'posts/TOGGLE_ORDER',
     }),
   },
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 5ca6247b8..09d4cf919 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -191,6 +191,7 @@ export default {
   computed: {
     ...mapGetters({
       postsFilter: 'posts/filter',
+      eventsEnded: 'posts/eventsEnded',
     }),
     filterButtonIcon() {
       return this.showFilter ? 'angle-up' : 'angle-down'