diff --git a/mod/quiz/grading.php b/mod/quiz/grading.php
index be8312abefd..50a22028691 100644
--- a/mod/quiz/grading.php
+++ b/mod/quiz/grading.php
@@ -261,7 +261,7 @@
                    "   AND q.id IN ($questionlist)".
                    "   AND q.qtype = '".ESSAY."'".
                    "   ORDER BY q.name";
-            if (!$questions = get_records_sql($sql)) {
+            if (empty($questionlist) or !$questions = get_records_sql($sql)) {
                 print_heading(get_string('noessayquestionsfound', 'quiz'));
                 print_footer($course);
                 exit();