diff --git a/src/PHPCensor/Command/PollCommand.php b/src/PHPCensor/Command/PollCommand.php
index 73955acd..32ac9a04 100644
--- a/src/PHPCensor/Command/PollCommand.php
+++ b/src/PHPCensor/Command/PollCommand.php
@@ -2,9 +2,9 @@
 /**
  * PHPCI - Continuous Integration for PHP
  *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
+ * @copyright Copyright 2014, Block 8 Limited.
+ * @license   https://github.com/Block8/PHPCI/blob/master/LICENSE.md
+ * @link      https://www.phptesting.org/
  */
 
 namespace PHPCensor\Command;
@@ -21,9 +21,10 @@ use PHPCensor\Model\Build;
 
 /**
  * Run console command - Poll github for latest commit id
- * @author       Jimmy Cleuren <jimmy.cleuren@gmail.com>
- * @package      PHPCI
- * @subpackage   Console
+ * 
+ * @author     Jimmy Cleuren <jimmy.cleuren@gmail.com>
+ * @package    PHPCI
+ * @subpackage Console
  */
 class PollCommand extends Command
 {
diff --git a/src/PHPCensor/Controller/BuildStatusController.php b/src/PHPCensor/Controller/BuildStatusController.php
index 325851f3..055e8dea 100644
--- a/src/PHPCensor/Controller/BuildStatusController.php
+++ b/src/PHPCensor/Controller/BuildStatusController.php
@@ -170,19 +170,18 @@ class BuildStatusController extends Controller
 
     /**
      * View the public status page of a given project, if enabled.
-     * @param $projectId
+     * 
+     * @param integer $projectId
+     * 
      * @return string
+     * 
      * @throws \b8\Exception\HttpException\NotFoundException
      */
     public function view($projectId)
     {
         $project = $this->projectStore->getById($projectId);
 
-        if (empty($project)) {
-            throw new NotFoundException('Project with id: ' . $projectId . ' not found');
-        }
-
-        if (!$project->getAllowPublicStatus()) {
+        if (empty($project) || !$project->getAllowPublicStatus() || $project->getArchived()) {
             throw new NotFoundException('Project with id: ' . $projectId . ' not found');
         }
 
diff --git a/src/PHPCensor/View/Project/view.phtml b/src/PHPCensor/View/Project/view.phtml
index 974f8b2a..b0a86a06 100644
--- a/src/PHPCensor/View/Project/view.phtml
+++ b/src/PHPCensor/View/Project/view.phtml
@@ -70,7 +70,7 @@
 
     <div class="col-lg-3 col-md-4 col-sm-4">
 
-        <?php if ($project->getAllowPublicStatus()): ?>
+        <?php if ($project->getAllowPublicStatus() && !$project->getArchived()): ?>
             <div class="box">
                 <div class="box-header">
                     <h4 class="box-title"><?= Lang::get('public_status_title'); ?></h4>