diff --git a/mod/assign/renderer.php b/mod/assign/renderer.php
index 6a1b81abb26..858f9519f6d 100644
--- a/mod/assign/renderer.php
+++ b/mod/assign/renderer.php
@@ -1025,7 +1025,9 @@ class mod_assign_renderer extends plugin_renderer_base {
             $grade = null;
             foreach ($history->grades as $onegrade) {
                 if ($onegrade->attemptnumber == $submission->attemptnumber) {
-                    $grade = $onegrade;
+                    if ($onegrade->grade != ASSIGN_GRADE_NOT_SET) {
+                        $grade = $onegrade;
+                    }
                     break;
                 }
             }