diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index f61aa404ef1..79bdb4f8fda 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -2643,7 +2643,9 @@ class assign {
             // Give each submission plugin a chance to process the submission
             $plugins = $this->get_submission_plugins();
             foreach ($plugins as $plugin) {
-                $plugin->submit_for_grading();
+                if ($plugin->is_enabled() && $plugin->is_visible()) {
+                    $plugin->submit_for_grading();
+                }
             }
 
             $submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
@@ -2921,7 +2923,7 @@ class assign {
             $allempty = true;
             $pluginerror = false;
             foreach ($this->submissionplugins as $plugin) {
-                if ($plugin->is_enabled()) {
+                if ($plugin->is_enabled() && $plugin->is_visible()) {
                     if (!$plugin->save($submission, $data)) {
                         $notices[] = $plugin->get_error();
                         $pluginerror = true;