diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java b/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java
index 543ed71..9603226 100644
--- a/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java
+++ b/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java
@@ -305,8 +305,10 @@ public class TestController {
             testDTO.setOwner(username);
             if (usersTests != null){
                 List<TestResult> testResults = testResultRepository.findByIdOwnerAndIdTest(usersTests.getId(), test.getId());
-                testDTO.setGrade(testResults.get(testResults.size() - 1).getUserScore());
-                testDTO.setMaxScore(testResults.get(testResults.size() - 1).getMaxScore());
+                if (testResults.size() > 0) {
+                    testDTO.setGrade(testResults.get(testResults.size() - 1).getUserScore());
+                    testDTO.setMaxScore(testResults.get(testResults.size() - 1).getMaxScore());
+                }
             }
 
             if(test.getGroupId() != null)