diff --git a/admin.php b/admin.php
index 44677801..6102c43f 100644
--- a/admin.php
+++ b/admin.php
@@ -523,18 +523,17 @@ class AdminPlugin extends Plugin
      */
     public function onShutdown()
     {
-        // Just so we know that we're in this debug mode
-        if ($this->config->get('plugins.admin.popularity.enabled')) {
-
-            // Only track non-admin
-            if (!$this->active) {
+        if ($this->active) {
+            //only activate when Admin is active
+            if ($this->shouldLoadAdditionalFilesInBackground()) {
+                $this->loadAdditionalFilesInBackground();
+            }
+        } else {
+            //if popularity is enabled, track non-admin hits
+            if ($this->config->get('plugins.admin.popularity.enabled')) {
                 $this->popularity->trackHit();
             }
         }
-
-        if ($this->grav['admin']->shouldLoadAdditionalFilesInBackground()) {
-            $this->grav['admin']->loadAdditionalFilesInBackground();
-        }
     }
 
     /**