diff --git a/mod/assign/classes/event/assessable_submitted.php b/mod/assign/classes/event/assessable_submitted.php
index 09f8fe45325..cb042145a66 100644
--- a/mod/assign/classes/event/assessable_submitted.php
+++ b/mod/assign/classes/event/assessable_submitted.php
@@ -143,9 +143,5 @@ class assessable_submitted extends base {
         if (!isset($this->other['submission_editable'])) {
             throw new \coding_exception('Other must contain the key submission_editable.');
         }
-
-        if ($this->contextlevel != CONTEXT_MODULE) {
-            throw new \coding_exception('Context passed must be module context.');
-        }
     }
 }
diff --git a/mod/assign/classes/event/base.php b/mod/assign/classes/event/base.php
index d6e1a4d8894..2dacf2efcd7 100644
--- a/mod/assign/classes/event/base.php
+++ b/mod/assign/classes/event/base.php
@@ -115,4 +115,17 @@ abstract class base extends \core\event\base {
 
         return null;
     }
+
+    /**
+     * Custom validation.
+     *
+     * @throws \coding_exception
+     */
+    protected function validate_data() {
+        parent::validate_data();
+
+        if ($this->contextlevel != CONTEXT_MODULE) {
+            throw new \coding_exception('Context passed must be module context.');
+        }
+    }
 }