diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index be9777c37a..ab50ece15f 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -1212,7 +1212,9 @@ def submission_history(request, course_id, student_username, location):
     # This is ugly, but until we have a proper submissions API that we can use to provide
     # the scores instead, it will have to do.
     scores = list(StudentModuleHistory.objects.filter(
-        student_module__module_state_key=usage_key
+        student_module__module_state_key=usage_key,
+        student_module__student__username=student_username,
+        student_module__course_id=course_key
     ).order_by('-id'))
 
     if len(scores) != len(history_entries):