diff --git a/src/pretix/control/forms/filter.py b/src/pretix/control/forms/filter.py
index 144409fd33..b3cb7b9283 100644
--- a/src/pretix/control/forms/filter.py
+++ b/src/pretix/control/forms/filter.py
@@ -723,10 +723,12 @@ class EventFilterForm(FilterForm):
         elif fdata.get('status') == 'running':
             qs = qs.filter(
                 live=True
+            ).annotate(
+                p_end=Coalesce(F('presale_end'), F('date_to'), F('date_from'))
             ).filter(
                 Q(presale_start__isnull=True) | Q(presale_start__lte=now())
             ).filter(
-                Q(presale_end__isnull=True) | Q(presale_end__gte=now())
+                Q(p_end__gte=now())
             )
         elif fdata.get('status') == 'notlive':
             qs = qs.filter(live=False)