diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index c3389c5523c..2ab07c099fc 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -47,6 +47,7 @@ class mod_quiz_mod_form extends moodleform_mod {
         $mform->setAdvanced('timelimitgrp', $CFG->quiz_fix_timelimit);
         $mform->setHelpButton('timelimitgrp', array("timelimit", get_string("quiztimer","quiz"), "quiz"));
         $mform->setDefault('timelimit', $CFG->quiz_timelimit);
+        $mform->setDefault('timelimitenable', !empty($CFG->quiz_timelimit));
 
 
         //enforced time delay between quiz attempts add-on
@@ -266,12 +267,10 @@ class mod_quiz_mod_form extends moodleform_mod {
                 }
                 $key++;
             }
-
         }
-        if (empty($default_values['timelimit'])) {
-            $default_values['timelimitenable'] = 0;
-        } else {
-            $default_values['timelimitenable'] = 1;
+
+        if (isset($default_values['timelimit'])) {
+            $default_values['timelimitenable'] = $default_values['timelimit'] > 0;
         }
 
         if (isset($default_values['review'])){