diff --git a/include/class_listing.inc b/include/class_listing.inc
index 0e57928293f27fdf579639df94c762bdc67a57a4..9d2231a3872d00fc4714e5449f946aa63252073a 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -1500,7 +1500,7 @@ class listing {
       }
     }
 
-    if (!isset($this->bases[$this->base])) {
+    if (!empty($this->bases) && !isset($this->bases[$this->base])) {
       $this->base = key($this->bases);
     }
 
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index e544e84ebdb14c2c154ab8f710802ec5515783c6..79e9b83aed3fdf76562e6d4079e80f9411add752 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -192,7 +192,7 @@ class simpleManagement extends management
 
     $this->configureHeadpage();
     $this->configureFilter();
-    if ($this->departmentBrowser === FALSE) {
+    if ($this->baseMode === FALSE) {
       $this->headpage->setBase($this->config->current['BASE']);
     }
   }