diff --git a/Modules/Page/Http/Controllers/PublicController.php b/Modules/Page/Http/Controllers/PublicController.php
index 5a207c2f6..61ae6cc7b 100644
--- a/Modules/Page/Http/Controllers/PublicController.php
+++ b/Modules/Page/Http/Controllers/PublicController.php
@@ -84,12 +84,12 @@ private function getTemplateForPage($page)
     }
 
     /**
-     * Throw a 404 error page if the given page is not found
+     * Throw a 404 error page if the given page is not found or draft
      * @param $page
      */
     private function throw404IfNotFound($page)
     {
-        if (is_null($page)) {
+        if ($page->status == 0 || is_null($page)) {
             $this->app->abort('404');
         }
     }