diff --git a/webapp/components/FilterMenu/EventsByFilter.vue b/webapp/components/FilterMenu/EventsByFilter.vue
index f29c5eb81..79285bc47 100644
--- a/webapp/components/FilterMenu/EventsByFilter.vue
+++ b/webapp/components/FilterMenu/EventsByFilter.vue
@@ -5,9 +5,9 @@
         <labeled-button
           icon="check"
           :label="$t('filter-menu.ended.all.label')"
-          :filled="eventsEnded === ''"
+          :filled="!eventsEnded"
           :title="$t('filter-menu.ended.all.hint')"
-          @click="toggleEventsEnded('')"
+          @click="toggleEventsEnded(false)"
           data-test="all-button"
         />
       </li>
@@ -15,9 +15,9 @@
         <labeled-button
           icon="calendar"
           :label="$t('filter-menu.ended.onlyEnded.label')"
-          :filled="eventsEnded === 'eventStart_gte'"
+          :filled="!!eventsEnded"
           :title="$t('filter-menu.ended.onlyEnded.hint')"
-          @click="toggleEventsEnded('eventStart_gte')"
+          @click="toggleEventsEnded(true)"
           data-test="not-ended-button"
         />
       </li>
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 16a41a831..ccb49cf74 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -203,7 +203,7 @@ export default {
       filter = {
         ...filter,
         tags_some: this.hashtag ? { id: this.hashtag } : undefined,
-        eventStart_gte: this.eventsEnded === 'eventStart_gte' ? new Date() : undefined,
+        eventStart_gte: this.eventsEnded,
       }
       return filter
     },
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 4c213af92..e20391a9c 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -18,7 +18,7 @@ export const state = () => {
       ...defaultFilter,
     },
     order: 'createdAt_desc',
-    eventsEnded: '',
+    eventsEnded: null,
   }
 }
 
@@ -60,7 +60,7 @@ const TOGGLE_SET_UNSET_POST_TYPE_FILTER = (state, setPostType) => {
   adjustOrder(state)
 }
 const TOGGLE_EVENTS_ENDED = (state, value) => {
-  state.eventsEnded = value
+  state.eventsEnded = value ? new Date() : null
 }
 const TOGGLE_ORDER = (state, value) => {
   state.order = value
@@ -68,9 +68,9 @@ const TOGGLE_ORDER = (state, value) => {
 const adjustEventsEnded = (state, beforeEventSetInPostTypeFilter) => {
   if (eventSetInPostTypeFilter(state) !== beforeEventSetInPostTypeFilter) {
     if (eventSetInPostTypeFilter(state)) {
-      TOGGLE_EVENTS_ENDED(state, 'eventStart_gte')
+      TOGGLE_EVENTS_ENDED(state, true)
     } else {
-      TOGGLE_EVENTS_ENDED(state, '')
+      TOGGLE_EVENTS_ENDED(state, false)
     }
   }
 }