diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php
index fb96e4478..3b909c008 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php
@@ -42,8 +42,11 @@ class IndexController extends \OPNsense\Base\IndexController
     public function indexAction()
     {
         $this->view->title = gettext("Page not found");
-        $this->view->pick('OPNsense/Core/index');
-        $this->response->setStatusCode(404, "Not Found");
+        $this->view->pick('OPNsense/Core/not_found');
+        if ( $this->response->getStatusCode() != '302') {
+            // don't send 404 when redirecting to login page
+            $this->response->setStatusCode(404, "Not Found");
+        }
         return;
     }
 }
diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/index.volt b/src/opnsense/mvc/app/views/OPNsense/Core/not_found.volt
similarity index 100%
rename from src/opnsense/mvc/app/views/OPNsense/Core/index.volt
rename to src/opnsense/mvc/app/views/OPNsense/Core/not_found.volt