diff --git a/app/Composers/IndexComposer.php b/app/Composers/IndexComposer.php
index 939a67a8a..24e56338d 100644
--- a/app/Composers/IndexComposer.php
+++ b/app/Composers/IndexComposer.php
@@ -29,7 +29,6 @@ class IndexComposer
         $withData = [
             'systemStatus'  => 'danger',
             'systemMessage' => trans('cachet.service.bad'),
-            'pageTitle'     => Setting::get('app_name'),
         ];
 
         if (Component::notStatus(1)->count() === 0) {
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 1489aa7b4..0d06edd07 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -109,6 +109,7 @@ class HomeController extends AbstractController
             'canPageBackward'      => $canPageBackward,
             'previousDate'         => $startDate->copy()->subDays($daysToShow)->toDateString(),
             'nextDate'             => $startDate->copy()->addDays($daysToShow)->toDateString(),
+            'pageTitle'            => Setting::get('app_name').' Status',
         ]);
     }
 }
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
index 58d2daebe..960e0e488 100644
--- a/resources/views/layout/master.blade.php
+++ b/resources/views/layout/master.blade.php
@@ -7,8 +7,8 @@
     <meta name="env" content="{{ app('env') }}">
     <meta name="token" content="{{ csrf_token() }}">
 
-    <link rel="alternate" type="application/atom+xml" href="/atom" title="{{ $pageTitle ?: Setting::get('app_name') }} Status - Atom Feed">
-    <link rel="alternate" type="application/rss+xml" href="/rss" title="{{ $pageTitle ?: Setting::get('app_name') }} Status - RSS Feed">
+    <link rel="alternate" type="application/atom+xml" href="/atom" title="{{ $pageTitle }} - Atom Feed">
+    <link rel="alternate" type="application/rss+xml" href="/rss" title="{{ $pageTitle }} - RSS Feed">
 
     <!-- Mobile friendliness -->
     <meta name="HandheldFriendly" content="True">
@@ -30,7 +30,7 @@
     <link rel="apple-touch-icon" sizes="144x144" href="/img/apple-touch-icon-144x144.png">
     <link rel="apple-touch-icon" sizes="152x152" href="/img/apple-touch-icon-152x152.png">
 
-    <title>{{ $pageTitle ?: Setting::get('app_name') }} Status</title>
+    <title>{{ $pageTitle }}</title>
 
     <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">