diff --git a/system/src/Grav/Common/Session.php b/system/src/Grav/Common/Session.php
index c587b6332..cb63df20b 100644
--- a/system/src/Grav/Common/Session.php
+++ b/system/src/Grav/Common/Session.php
@@ -20,17 +20,23 @@ class Session extends \RocketTheme\Toolbox\Session\Session
         $uri = $this->grav['uri'];
         $config = $this->grav['config'];
 
-        if ($config->get('system.session.enabled')) {
-            // Only activate admin if we're inside the admin path.
-            $is_admin = false;
+        $is_admin = false;
+
+        $session_timeout = $config->get('system.session.timeout', 1800);
+        $session_path = $config->get('system.session.path', '/' . ltrim($uri->rootUrl(false), '/'));
+
+        // Activate admin if we're inside the admin path.
+        if ($config->get('plugins.admin.enabled')) {
             $route = $config->get('plugins.admin.route');
             $base = '/' . trim($route, '/');
             if (substr($uri->route(), 0, strlen($base)) == $base) {
+                $session_timeout = $config->get('plugins.admin.session.timeout', 1800);
                 $is_admin = true;
             }
+        }
+
+        if ($config->get('system.session.enabled') || $is_admin) {
 
-            $session_timeout = $config->get('system.session.timeout', 1800);
-            $session_path = $config->get('system.session.path', '/' . ltrim($uri->rootUrl(false), '/'));
 
             // Define session service.
             parent::__construct(