diff --git a/src/modules/activities/composables/useEvents.ts b/src/modules/activities/composables/useEvents.ts
index 2e20eed..a67cf69 100644
--- a/src/modules/activities/composables/useEvents.ts
+++ b/src/modules/activities/composables/useEvents.ts
@@ -43,7 +43,7 @@ export function useEvents() {
   const pastEvents = computed(() => {
     const now = new Date()
     return sortedEvents.value.filter(event =>
-      new Date(event.event_end_date) < now
+      new Date(event.event_end_date ?? event.event_start_date) < now
     )
   })
 
diff --git a/src/modules/activities/views/EventsPage.vue b/src/modules/activities/views/EventsPage.vue
index 4bb3be6..b173cf3 100644
--- a/src/modules/activities/views/EventsPage.vue
+++ b/src/modules/activities/views/EventsPage.vue
@@ -29,7 +29,7 @@ const selectedEvent = ref<{
 
 const showCreateDialog = ref(false)
 
-function formatDate(dateStr: string) {
+function formatDate(dateStr: string | null | undefined) {
   if (!dateStr) return 'Date not available'
   const date = new Date(dateStr)
   if (isNaN(date.getTime())) return 'Invalid date'