diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index 7a3a09ed31f512757295e96216f53e97ece5d2d4..06317b67a95e8b93a578f7016c986c911c64c014 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -282,11 +282,18 @@ class Course_WikiController extends AuthenticatedController
 
     public function allpages_action()
     {
-        Navigation::activateItem('/course/wiki/allpages');
         $this->pages = WikiPage::findBySQL(
             "`range_id` = ? ORDER BY `name` ASC",
             [$this->range->id]
         );
+
+        if (count($this->pages) === 0) {
+            $this->redirect($this->pageURL());
+            return;
+        }
+
+        Navigation::activateItem('/course/wiki/allpages');
+
         if ($GLOBALS['perm']->have_studip_perm('tutor', $this->range->id)) {
             $actions = new ActionsWidget();
             $actions->addLink(