diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 855ea61db11..6585d87a25c 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -2352,9 +2352,11 @@ function quiz_add_quiz_question($questionid, $quiz, $page = 0, $maxmark = null)
               JOIN {question_bank_entries} qbe ON qbe.id = qr.questionbankentryid
              WHERE slot.quizid = ?
                AND qr.component = ?
-               AND qr.questionarea = ?";
+               AND qr.questionarea = ?
+               AND qr.usingcontextid = ?";
 
-    $questionslots = $DB->get_records_sql($sql, [$quiz->id, 'mod_quiz', 'slot']);
+    $questionslots = $DB->get_records_sql($sql, [$quiz->id, 'mod_quiz', 'slot',
+            context_module::instance($quiz->cmid)->id]);
 
     $currententry = get_question_bank_entry($questionid);