diff --git a/rapids/views.py b/rapids/views.py
index 62d58ff6..4d9a667b 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -747,7 +747,9 @@ def exam_scores_cid_user(request, pk, cid, passcode):
 
     # TODO:Need some kind of test for cid
 
-    questions = exam.exam_questions.all().select_related("cid_user_answers").prefetch_related("cid_user_answers", "answers")
+    questions = exam.exam_questions.all().prefetch_related("cid_user_answers", "answers")
+
+    cid_user_answers = CidUserAnswer.objects.filter(cid=cid, exam__id=pk)
 
     answers_and_marks = []
     answers_marks = []
@@ -759,7 +761,8 @@ def exam_scores_cid_user(request, pk, cid, passcode):
 
     for q in questions:
         # Get user answer
-        user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
+        #user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
+        user_answer = cid_user_answers.filter(question=q).first()
 
         if not user_answer or user_answer is None:
             # skip if no answer