diff --git a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
index ee5051e572..f77a230c9c 100644
--- a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
@@ -308,12 +308,12 @@ const GradingWorkspace: React.FC<Props> = props => {
             xpAdjustment={grading!.answers[questionId].grade.xpAdjustment}
             maxXp={grading!.answers[questionId].question.maxXp}
             studentNames={
-              grading![questionId].student.name
+              grading!.answers[questionId].student.name
                 ? [grading!.answers[questionId].student.name]
                 : grading!.answers[questionId].team!.map(member => member.name)
             }
             studentUsernames={
-              grading![questionId].student.username
+              grading!.answers[questionId].student.username
                 ? [grading!.answers[questionId].student.username]
                 : grading!.answers[questionId].team!.map(member => member.username)
             }