diff --git a/system/src/Grav/Common/Service/PageServiceProvider.php b/system/src/Grav/Common/Service/PageServiceProvider.php
index c57c8d1e0..24b1e7e4f 100644
--- a/system/src/Grav/Common/Service/PageServiceProvider.php
+++ b/system/src/Grav/Common/Service/PageServiceProvider.php
@@ -34,16 +34,16 @@ class PageServiceProvider implements ServiceProviderInterface
 
             $page = $pages->dispatch($path);
 
-            // some debugger override logic
-            if ($page->debugger() == false) {
-                Grav::instance()['debugger']->enabled(false);
-            }
-
             // Redirection tests
             if ($page) {
                 /** @var Language $language */
                 $language = $c['language'];
 
+                // some debugger override logic
+                if ($page->debugger() == false) {
+                    Grav::instance()['debugger']->enabled(false);
+                }
+
                 if ($c['config']->get('system.force_ssl')) {
                     if (!isset($_SERVER['HTTPS']) || $_SERVER["HTTPS"] != "on") {
                         $url = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];