diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index 39a486097c8..320b01aa2b7 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -381,6 +381,10 @@ class mod_quiz_mod_form extends moodleform_mod {
         // Check and act on whether setting outcomes is considered an advanced setting.
         $mform->setAdvanced('modoutcomes', !empty($quizconfig->outcomes_adv));
 
+        // The standard_coursemodule_elements method sets this to 100, but the
+        // quiz has its own setting, so use that.
+        $mform->setDefault('grade', $quizconfig->maximumgrade);
+
         // -------------------------------------------------------------------------------
         $this->add_action_buttons();
     }