diff --git a/app/views/exercises/statistics.html.slim b/app/views/exercises/statistics.html.slim
index 4422d4f1..97757feb 100644
--- a/app/views/exercises/statistics.html.slim
+++ b/app/views/exercises/statistics.html.slim
@@ -42,8 +42,7 @@ h1 = @exercise
   - submissions = Submission.where(user: @exercise.send(symbol).distinct, exercise: @exercise).in_study_group_of(current_user)
   - if !policy(@exercise).detailed_statistics?
     - submissions = submissions.final
-  - latest_submission = submissions.latest
-  - if latest_submission
+  - if submissions.any?
     .table-responsive
       table.table.table-striped.sortable
         thead
@@ -61,12 +60,13 @@ h1 = @exercise
             tr
               td = link_to_if symbol==:external_users && policy(user).statistics?, label, {controller: "exercises", action: "statistics", external_user_id: user.id, id: @exercise.id}
               td = us['maximum_score'] or 0
-              td.align-middle 
-                - if latest_submission.before_deadline?
+              td.align-middle
+                - latest_user_submission = submissions.where(user: user).latest
+                - if latest_user_submission.before_deadline?
                   .unit-test-result.positive-result.before_deadline
-                - elsif latest_submission.within_grace_period?
+                - elsif latest_user_submission.within_grace_period?
                   .unit-test-result.unknown-result.within_grace_period
-                - elsif latest_submission.after_late_deadline?
+                - elsif latest_user_submission.after_late_deadline?
                   .unit-test-result.negative-result.after_late_deadline
               td = us['runs'] if policy(@exercise).detailed_statistics?
               td = @exercise.average_working_time_for(user.id) or 0 if policy(@exercise).detailed_statistics?