diff --git a/server/users/schema.py b/server/users/schema.py
index 4b2abe48..570b9fcd 100644
--- a/server/users/schema.py
+++ b/server/users/schema.py
@@ -56,6 +56,8 @@ class UserNode(DjangoObjectType):
         return self.is_teacher()
 
     def resolve_school_classes(self, info):
+        if self.selected_class() is None:  # then we don't have any class to return
+            return []
         return SchoolClass.objects.filter(
             Q(schoolclassmember__active=True, schoolclassmember__user=self) | Q(pk=self.selected_class().pk)).distinct()