diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 2e245826d..38e1327ba 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -200,6 +200,9 @@ class Controller extends BaseController
         if ($event = $this->fireEvent('page.display', [$this, $url, $page], true))
             return $event;
 
+        if ($page->url == '/404')
+            return Response::make($result, 404);
+
         return $result;
     }