diff --git a/src/App.php b/src/App.php
index 32e9fa876..0f0c0537e 100644
--- a/src/App.php
+++ b/src/App.php
@@ -988,7 +988,7 @@ class App
 			header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string);
 
 			Module\Special\HTTPException::rawContent(
-				new HTTPException\ServiceUnavaiableException('The node is currently overloaded. Please try again later.')
+				new HTTPException\ServiceUnavailableException('The node is currently overloaded. Please try again later.')
 			);
 		}
 
diff --git a/src/Module/Maintenance.php b/src/Module/Maintenance.php
index e7dc5a075..24140bb35 100644
--- a/src/Module/Maintenance.php
+++ b/src/Module/Maintenance.php
@@ -4,8 +4,8 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
 
 /**
@@ -25,13 +25,8 @@ class Maintenance extends BaseModule
 			System::externalRedirect($reason, 307);
 		}
 
-		header('HTTP/1.1 503 Service Temporarily Unavailable');
-		header('Status: 503 Service Temporarily Unavailable');
-		header('Retry-After: 600');
-
-		return Renderer::replaceMacros(Renderer::getMarkupTemplate('maintenance.tpl'), [
-			'$sysdown' => L10n::t('System down for maintenance'),
-			'$reason' => $reason
-		]);
+		$exception = new HTTPException\ServiceUnavailableException($reason);
+		$exception->httpdesc = L10n::t('System down for maintenance');
+		throw $exception;
 	}
 }
diff --git a/src/Network/HTTPException/ServiceUnavaiableException.php b/src/Network/HTTPException/ServiceUnavailableException.php
similarity index 67%
rename from src/Network/HTTPException/ServiceUnavaiableException.php
rename to src/Network/HTTPException/ServiceUnavailableException.php
index 6c0e6595d..257b8c858 100644
--- a/src/Network/HTTPException/ServiceUnavaiableException.php
+++ b/src/Network/HTTPException/ServiceUnavailableException.php
@@ -4,7 +4,7 @@ namespace Friendica\Network\HTTPException;
 
 use Friendica\Network\HTTPException;
 
-class ServiceUnavaiableException extends HTTPException
+class ServiceUnavailableException extends HTTPException
 {
 	protected $code = 503;
 }