diff --git a/app/Http/Controllers/HealthcheckController.php b/app/Http/Controllers/System/HealthcheckController.php
similarity index 88%
rename from app/Http/Controllers/HealthcheckController.php
rename to app/Http/Controllers/System/HealthcheckController.php
index edbb8b52aa..dd5c24cf82 100644
--- a/app/Http/Controllers/HealthcheckController.php
+++ b/app/Http/Controllers/System/HealthcheckController.php
@@ -1,7 +1,7 @@
 <?php
-/**
+/*
  * HealthcheckController.php
- * Copyright (c) 2019 james@firefly-iii.org
+ * Copyright (c) 2021 https://github.com/ajgon
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -20,8 +20,9 @@
  */
 declare(strict_types=1);
 
-namespace FireflyIII\Http\Controllers;
+namespace FireflyIII\Http\Controllers\System;
 
+use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Http\Response;
 
 /**
diff --git a/routes/web.php b/routes/web.php
index c6fd5bb980..51fb1ca59f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -38,9 +38,10 @@ Route::group(
 );
 
 Route::group(
-    ['middleware' => 'binders-only'],
+    ['middleware' => 'binders-only',  'namespace' => 'FireflyIII\Http\Controllers\System'],
     static function () {
         Route::get('offline', fn () => view('errors.offline'));
+        Route::get('health', ['uses' => 'HealthcheckController@check', 'as' => 'healthcheck']);
     }
 );
 
@@ -69,8 +70,7 @@ Route::group(
         Route::get('profile/confirm-email-change/{token}', ['uses' => 'ProfileController@confirmEmailChange', 'as' => 'profile.confirm-email-change']);
         Route::get('profile/undo-email-change/{token}/{oldAddressHash}', ['uses' => 'ProfileController@undoEmailChange', 'as' => 'profile.undo-email-change']);
 
-        // Healthcheck route:
-        Route::get('health', ['uses' => 'HealthcheckController@check', 'as' => 'healthcheck']);
+
     }
 );