diff --git a/mod/data/lib.php b/mod/data/lib.php
index 0bc02703f2c..3b385c6704a 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -910,6 +910,11 @@ function data_add_instance($data, $mform = null) {
         $data->assessed = 0;
     }
 
+    if (empty($data->ratingtime) || empty($data->assessed)) {
+        $data->assesstimestart  = 0;
+        $data->assesstimefinish = 0;
+    }
+
     $data->timemodified = time();
 
     $data->id = $DB->insert_record('data', $data);