diff --git a/src/pretix/base/timeline.py b/src/pretix/base/timeline.py
index e3e5a9f64..10006402b 100644
--- a/src/pretix/base/timeline.py
+++ b/src/pretix/base/timeline.py
@@ -159,6 +159,18 @@ def timeline_for_event(event, subevent=None):
             })
         ))
 
+    rd = event.settings.get('waiting_list_auto_disable', as_type=RelativeDateWrapper)
+    if rd and event.settings.waiting_list_enabled:
+        tl.append(TimelineEvent(
+            event=event, subevent=subevent,
+            datetime=rd.datetime(ev),
+            description=pgettext_lazy('timeline', 'Waiting list is disabled'),
+            edit_url=reverse('control:event.settings', kwargs={
+                'event': event.slug,
+                'organizer': event.organizer.slug
+            }) + '#waiting-list-open'
+        ))
+
     if not event.has_subevents:
         days = event.settings.get('mail_days_download_reminder', as_type=int)
         if days is not None and event.settings.ticket_download:
diff --git a/src/pretix/control/templates/pretixcontrol/event/settings.html b/src/pretix/control/templates/pretixcontrol/event/settings.html
index 3c74d9d2b..50f6c438b 100644
--- a/src/pretix/control/templates/pretixcontrol/event/settings.html
+++ b/src/pretix/control/templates/pretixcontrol/event/settings.html
@@ -335,7 +335,7 @@
                 {% bootstrap_field sform.max_items_per_order layout="control" %}
                 {% bootstrap_field sform.redirect_to_checkout_directly layout="control" %}
             </fieldset>
-            <fieldset>
+            <fieldset id="waiting-list">
                 <legend>{% trans "Waiting list" %}</legend>
                 <div class="alert alert-info">
                     {% blocktrans trimmed %}