diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py
index 80f642afd..95be0a439 100644
--- a/src/pretix/presale/views/event.py
+++ b/src/pretix/presale/views/event.py
@@ -411,7 +411,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
             context['frontpage_text'] = str(self.request.event.settings.frontpage_text)
 
         context['list_type'] = self.request.GET.get("style", self.request.event.settings.event_list_type)
-        if context['list_type'] not in ("calendar", "week") and self.request.event.subevents.count() > 100:
+        if context['list_type'] not in ("calendar", "week") and self.request.event.subevents.filter(date_from__gt=now()).count() > 50:
             if self.request.event.settings.event_list_type not in ("calendar", "week"):
                 self.request.event.settings.event_list_type = "calendar"
             context['list_type'] = "calendar"
diff --git a/src/pretix/presale/views/widget.py b/src/pretix/presale/views/widget.py
index c57b6fd94..b842c59ca 100644
--- a/src/pretix/presale/views/widget.py
+++ b/src/pretix/presale/views/widget.py
@@ -383,7 +383,7 @@ class WidgetAPIProductList(EventListMixin, View):
         data['list_type'] = list_type
 
         if hasattr(self.request, 'event') and data['list_type'] not in ("calendar", "week"):
-            if self.request.event.subevents.count() > 100:
+            if self.request.event.subevents.filter(date_from__gt=now()).count() > 50:
                 if self.request.event.settings.event_list_type not in ("calendar", "week"):
                     self.request.event.settings.event_list_type = "calendar"
                 data['list_type'] = list_type = 'calendar'