diff --git a/app/Http/Routes/FeedRoutes.php b/app/Http/Routes/FeedRoutes.php
new file mode 100644
index 00000000..c812efa6
--- /dev/null
+++ b/app/Http/Routes/FeedRoutes.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Http\Routes;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class FeedRoutes
+{
+    /**
+     * Define the status page routes.
+     *
+     * @param \Illuminate\Contracts\Routing\Registrar $router
+     */
+    public function map(Registrar $router)
+    {
+        // Prevent access until the app is setup.
+        $router->group(['middleware' => 'app.hasSetting', 'setting' => 'app_name'], function ($router) {
+            $router->get('/atom/{component_group?}', 'AtomController@feedAction');
+            $router->get('/rss/{component_group?}', 'RssController@feedAction');
+        });
+    }
+}
diff --git a/app/Http/Routes/StatusPageRoutes.php b/app/Http/Routes/StatusPageRoutes.php
index f0a78317..b65dd0c6 100644
--- a/app/Http/Routes/StatusPageRoutes.php
+++ b/app/Http/Routes/StatusPageRoutes.php
@@ -28,9 +28,6 @@ class StatusPageRoutes
                 'as'   => 'status-page',
                 'uses' => 'HomeController@showIndex',
             ]);
-
-            $router->get('/atom/{component_group?}', 'AtomController@feedAction');
-            $router->get('/rss/{component_group?}', 'RssController@feedAction');
         });
     }
 }