diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index fe6e8b554..b8c741057 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -125,11 +125,12 @@ class Controller extends BaseController
         /*
          * If the page was not found, render the 404 page - either provided by the theme or the built-in one.
          */
-        if (!$page && ($page = $this->router->findByUrl('/404')))
+        if (!$page) {
             $this->setStatusCode(404);
 
-        if (!$page)
-            return Response::make(View::make('cms::404'), 404);
+            if (!$page = $this->router->findByUrl('/404'))
+                return Response::make(View::make('cms::404'), $this->statusCode);
+        }
 
         $this->page = $page;