diff --git a/DigitalLearningSolutions.Data.Tests/Services/SelfAssessmentServiceTests.cs b/DigitalLearningSolutions.Data.Tests/Services/SelfAssessmentServiceTests.cs
index dbd2b9eb22..65667f0b29 100644
--- a/DigitalLearningSolutions.Data.Tests/Services/SelfAssessmentServiceTests.cs
+++ b/DigitalLearningSolutions.Data.Tests/Services/SelfAssessmentServiceTests.cs
@@ -44,7 +44,8 @@ public void GetSelfAssessmentForCandidateById_should_return_a_self_assessment()
                 32,
                 new DateTime(2020, 09, 01, 14, 10, 37, 447), null, null,
                 false,
-                true
+                true,
+                false
             );
 
             result.Should().BeEquivalentTo(expectedSelfAssessment);
diff --git a/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs b/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs
index 0cf68b63b0..3819b1c10a 100644
--- a/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs
+++ b/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs
@@ -63,7 +63,7 @@ FROM SelfAssessmentResults
 											  LEFT OUTER JOIN SelfAssessmentResultSupervisorVerifications AS sv
 											  ON s.ID = sv.SelfAssessmentResultId AND sv.Superceded = 0
                                 LEFT OUTER JOIN CompetencyAssessmentQuestionRoleRequirements rr
-                                ON s.CompetencyID = rr.CompetencyID AND s.AssessmentQuestionID = rr.AssessmentQuestionID AND s.SelfAssessmentID = rr.SelfAssessmentID
+                                ON s.CompetencyID = rr.CompetencyID AND s.AssessmentQuestionID = rr.AssessmentQuestionID AND s.SelfAssessmentID = rr.SelfAssessmentID AND s.Result = rr.LevelValue
 
                           WHERE CandidateID = @candidateId
                             AND s.SelfAssessmentID = @selfAssessmentId
@@ -98,7 +98,7 @@ LEFT OUTER JOIN SupervisorDelegates AS sd
 											  ON cas.SupervisorDelegateId = sd.ID
 
                                 LEFT OUTER JOIN CompetencyAssessmentQuestionRoleRequirements rr
-                                ON s.CompetencyID = rr.CompetencyID AND s.AssessmentQuestionID = rr.AssessmentQuestionID AND s.SelfAssessmentID = rr.SelfAssessmentID
+                                ON s.CompetencyID = rr.CompetencyID AND s.AssessmentQuestionID = rr.AssessmentQuestionID AND s.SelfAssessmentID = rr.SelfAssessmentID AND s.Result = rr.LevelValue
                           WHERE ca.ID = @candidateAssessmentId
                          )";
         private const string CompetencyFields = @"C.ID       AS Id,