diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8917fa6f83eaf37e404e58df850a93a6ecf0dd62..fd5828d6134274ad06f91ec7e592409a126471cb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ Fixed
 ~~~~~
 
 * Translate table columns and filter button on person overview page.
+* Show correct status icon for events.
 
 `2.0rc6`_ - 2021-08-25
 ----------------------
diff --git a/aleksis/apps/alsijil/util/alsijil_helpers.py b/aleksis/apps/alsijil/util/alsijil_helpers.py
index 29381c6cb76cd424e945b6e42bd2fdddf414c05c..95c49a0b5517d77d02d989999a8480e3621fbd97 100644
--- a/aleksis/apps/alsijil/util/alsijil_helpers.py
+++ b/aleksis/apps/alsijil/util/alsijil_helpers.py
@@ -85,7 +85,8 @@ def annotate_documentations(
     instances = instances.annotate(
         has_documentation=Exists(
             LessonDocumentation.objects.filter(
-                ~Q(topic__exact=""), week=wanted_week.week, year=wanted_week.year,
+                ~Q(topic__exact=""),
+                Q(week=wanted_week.week, year=wanted_week.year) | Q(week=None, year=None),
             ).filter(**{klass.label_: OuterRef("pk")})
         )
     )