diff --git a/server/assignments/schema/types.py b/server/assignments/schema/types.py
index e538d950..8c23e0f4 100644
--- a/server/assignments/schema/types.py
+++ b/server/assignments/schema/types.py
@@ -64,7 +64,7 @@ class AssignmentNode(DjangoObjectType):
         return []
 
     def resolve_solution(self, info, **kwargs):
-        if are_solutions_enabled_for(info.context.user, self.module) and self.solution is not None:
+        if (info.context.user.is_teacher() or are_solutions_enabled_for(info.context.user, self.module)) and self.solution is not None:
             return self.solution
         else:
             return None