diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 78a0527f9a9..a1685e309e7 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -1503,6 +1503,9 @@ class lesson extends lesson_base {
                                 $found = true;
                             } else if ($page->qtype == LESSON_PAGE_ENDOFCLUSTER) {
                                 $exitjump = $DB->get_field("lesson_answers", "jumpto", array("pageid" => $page->id, "lessonid" => $this->properties->id));
+                                if ($exitjump == LESSON_NEXTPAGE) {
+                                    $exitjump = $lessonpages[$page->id]->nextpageid;
+                                }
                                 break;
                             }
                         }