diff --git a/include/class_listing.inc b/include/class_listing.inc
index ef0ce4380ff90bf472227633b69f617ad1ed5cae..618014341b5ca763c99a29a614219b940da93548 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -650,8 +650,8 @@ class listing
     $this->base = $base;
     if ($this->baseMode) {
       $this->baseSelector->setBase($this->base);
+      session::global_set('CurrentMainBase', $this->base);
     }
-    session::global_set('CurrentMainBase', $this->base);
   }
 
   function tryAndSetBase($base)