diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 8150c42b509..ed311626d83 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -325,6 +325,7 @@ class assignment_base {
         $assignment->timemodified = time();
         if (empty($assignment->dueenable)) {
             $assignment->timedue = 0;
+            $assignment->preventlate = 0;
         } else {
             $assignment->timedue = make_timestamp($assignment->dueyear, $assignment->duemonth, 
                                                   $assignment->dueday, $assignment->duehour, 
@@ -332,7 +333,6 @@ class assignment_base {
         }
         if (empty($assignment->availableenable)) {
             $assignment->timeavailable = 0;
-            $assignment->preventlate = 0;
         } else {
             $assignment->timeavailable = make_timestamp($assignment->availableyear, $assignment->availablemonth, 
                                                         $assignment->availableday, $assignment->availablehour,