diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php
index bb57b154fc6..671d0aa6b77 100644
--- a/mod/quiz/attemptlib.php
+++ b/mod/quiz/attemptlib.php
@@ -2395,6 +2395,11 @@ class quiz_attempt {
             }
         }
 
+        // Verify if time is really up; time limit could have been changed.
+        if ($timeup && $timenow < $timeclose - QUIZ_MIN_TIME_TO_CONTINUE) {
+            $timeup = false;
+        }
+
         // If time is running out, trigger the appropriate action.
         $becomingoverdue = false;
         $becomingabandoned = false;