diff --git a/aleksis/apps/chronos/util/chronos_helpers.py b/aleksis/apps/chronos/util/chronos_helpers.py
index 94b197ac456121b287c9ec9e9355523cfb1625d2..fb1ab798af2505278ed4e327e4f631960bbde469 100644
--- a/aleksis/apps/chronos/util/chronos_helpers.py
+++ b/aleksis/apps/chronos/util/chronos_helpers.py
@@ -100,10 +100,10 @@ def get_classes(user: "User"):
                 wanted_classes.add(_class.pk)
 
         classes = classes.filter(
-            Q(pk__in=wanted_classes) | Q(members=user.person) | Q(pk=user.person.primary_group.pk)
-            if user.person.primary_group
-            else Q() | Q(owners=user.person)
+            Q(pk__in=wanted_classes) | Q(members=user.person) | Q(owners=user.person)
         )
+        if user.person.primary_group:
+            classes = classes.filter(Q(pk=user.person.primary_group.pk))
 
     return classes