diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 0c13e069168..5ad5eb2b340 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -3165,9 +3165,9 @@ class assign {
         if ($attemptnumber < 0 || $create) {
             // Make sure this grade matches the latest submission attempt.
             if ($this->get_instance()->teamsubmission) {
-                $submission = $this->get_group_submission($userid, 0, true);
+                $submission = $this->get_group_submission($userid, 0, true, $attemptnumber);
             } else {
-                $submission = $this->get_user_submission($userid, true);
+                $submission = $this->get_user_submission($userid, true, $attemptnumber);
             }
             if ($submission) {
                 $attemptnumber = $submission->attemptnumber;
diff --git a/mod/assign/tests/behat/edit_previous_feedback.feature b/mod/assign/tests/behat/edit_previous_feedback.feature
index a787fdb6adc..1c1f38f3793 100644
--- a/mod/assign/tests/behat/edit_previous_feedback.feature
+++ b/mod/assign/tests/behat/edit_previous_feedback.feature
@@ -73,6 +73,7 @@ Feature: In an assignment, teachers can edit feedback for a students previous su
     Then I log in as "student2"
     And I follow "Course 1"
     And I follow "Test assignment name"
-    And I click on ".mod-assign-history-link" "css_element"
     And I should see "I'm the teacher second feedback" in the "Feedback comments" "table_row"
     And I should see "50.00"
+    And I click on ".mod-assign-history-link" "css_element"
+    And I should not see "I'm the teacher second feedback" in the "Feedback comments" "table_row"