diff --git a/mod/workshop/db/upgradelib.php b/mod/workshop/db/upgradelib.php
index 4b79846f45a4f..4be768945c0d4 100644
--- a/mod/workshop/db/upgradelib.php
+++ b/mod/workshop/db/upgradelib.php
@@ -210,6 +210,14 @@ function workshop_upgrade_transform_instance(stdClass $old) {
         $new->strategy = 'rubric';
         break;
     }
+    if ($old->submissionstart < $old->submissionend) {
+        $new->submissionstart = $old->submissionstart;
+        $new->submissionend   = $old->submissionend;
+    }
+    if ($old->assessmentstart < $old->assessmentend) {
+        $new->assessmentstart = $old->assessmentstart;
+        $new->assessmentend   = $old->assessmentend;
+    }
 
     return $new;
 }