diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 48375937769..99efb11926c 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -4097,9 +4097,9 @@ class assign {
         }
 
         if ($this->get_instance()->teamsubmission) {
-            $submission = $this->get_group_submission($USER->id, 0, false);
+            $submission = $this->get_group_submission($userid, 0, false);
         } else {
-            $submission = $this->get_user_submission($USER->id, false);
+            $submission = $this->get_user_submission($userid, false);
         }
 
         if (!$submission) {