diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 93fe7a52a0b..75f4ccd9d9b 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -8918,7 +8918,7 @@ class assign_portfolio_caller extends portfolio_module_caller_base {
 
             $submission = $DB->get_record('assign_submission', array('id' => $this->sid));
         } else {
-            $submissionid = $DB->get_field('files', 'itemid', array('id' => $this->fileid));
+            $submissionid = $DB->get_field('files', 'itemid', array('id' => $this->fileid, 'contextid' => $context->id));
             if ($submissionid) {
                 $submission = $DB->get_record('assign_submission', array('id' => $submissionid));
             }