diff --git a/client/src/graphql/gql/meQuery.gql b/client/src/graphql/gql/meQuery.gql
index 3d14ca58..ca9fea70 100644
--- a/client/src/graphql/gql/meQuery.gql
+++ b/client/src/graphql/gql/meQuery.gql
@@ -1,4 +1,3 @@
-#import "./fragments/schoolClassParts.gql"
 #import "./fragments/userParts.gql"
 query MeQuery {
   me {
diff --git a/server/users/schema.py b/server/users/schema.py
index c5cc7412..45fe3a12 100644
--- a/server/users/schema.py
+++ b/server/users/schema.py
@@ -89,7 +89,7 @@ class UserNode(DjangoObjectType):
 
     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.none()
         return SchoolClass.objects.filter(
             Q(schoolclassmember__active=True, schoolclassmember__user=self) | Q(pk=self.selected_class().pk)).distinct()