diff --git a/mod/assign/lib.php b/mod/assign/lib.php
index b3b0123ec71..d0543925b46 100644
--- a/mod/assign/lib.php
+++ b/mod/assign/lib.php
@@ -248,7 +248,7 @@ function assign_update_events($assign, $override = null) {
         $groupid   = isset($current->groupid) ? $current->groupid : 0;
         $userid    = isset($current->userid) ? $current->userid : 0;
         $allowsubmissionsfromdate  = isset($current->allowsubmissionsfromdate
-        ) ? $current->allowsubmissionsfromdate : $assign->get_context()->allowsubmissionsfromdate;
+        ) ? $current->allowsubmissionsfromdate : $assigninstance->allowsubmissionsfromdate;
         $duedate = isset($current->duedate) ? $current->duedate : $assigninstance->duedate;
 
         // Only add open/close events for an override if they differ from the assign default.