diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index 948a1a99428..28990e63068 100644
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -445,8 +445,7 @@ class quiz_grading_report extends quiz_default_report {
             $attempt = $attempts[$qubaid];
             $quba = question_engine::load_questions_usage_by_activity($qubaid);
             $displayoptions = quiz_get_review_options($this->quiz, $attempt, $this->context);
-            $displayoptions->hide_all_feedback();
-            $displayoptions->rightanswer = question_display_options::VISIBLE;
+            $displayoptions->generalfeedback = question_display_options::HIDDEN;
             $displayoptions->history = question_display_options::HIDDEN;
             $displayoptions->manualcomment = question_display_options::EDITABLE;
 
diff --git a/mod/quiz/report/grading/tests/behat/grading.feature b/mod/quiz/report/grading/tests/behat/grading.feature
index 2a308a1db25..3951a5c1ce7 100644
--- a/mod/quiz/report/grading/tests/behat/grading.feature
+++ b/mod/quiz/report/grading/tests/behat/grading.feature
@@ -57,6 +57,10 @@ Feature: Basic use of the Manual grading report
     And I set the field "Order attempts" to "By student ID number"
     And I press "Change options"
 
+    # General feedback for Short answer 001 displays.
+    And I should see "That is a bad answer."
+    And I should see "The correct answer is: frog"
+
     # Adjust the mark for Student1.
     And I set the field "Comment" to "I have adjusted your mark to 0.6"
     And I set the field "Mark" to "0.6"