diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index b942f98f6..056549cff 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -190,7 +190,7 @@ class Controller
         /*
          * If the page was not found, render the 404 page - either provided by the theme or the built-in one.
          */
-        if (!$page) {
+        if (!$page || $url === '404') {
             $this->setStatusCode(404);
 
             // Log the 404 request