diff --git a/src/Module/Maintenance.php b/src/Module/Maintenance.php
index ece9cea13..36deee83d 100644
--- a/src/Module/Maintenance.php
+++ b/src/Module/Maintenance.php
@@ -22,6 +22,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
@@ -43,7 +44,17 @@ class Maintenance extends BaseModule
 		}
 
 		$exception = new HTTPException\ServiceUnavailableException($reason);
-		$exception->httpdesc = DI::l10n()->t('System down for maintenance');
-		throw $exception;
+
+		header($_SERVER["SERVER_PROTOCOL"] . ' ' . $exception->getCode() . ' ' . DI::l10n()->t('System down for maintenance'));
+
+		$tpl = Renderer::getMarkupTemplate('exception.tpl');
+
+		return Renderer::replaceMacros($tpl, [
+			'$title' => DI::l10n()->t('System down for maintenance'),
+			'$message' => DI::l10n()->t('This Friendica node is currently in maintenance mode, either automatically because it is self-updating or manually by the node administrator. This condition should be temporary, please come back in a few minutes.'),
+			'$thrown' => is_site_admin() ? $reason : '',
+			'$stack_trace' => '',
+			'$trace' => '',
+		]);
 	}
 }
diff --git a/view/templates/exception.tpl b/view/templates/exception.tpl
index 4b2966141..0456136bc 100644
--- a/view/templates/exception.tpl
+++ b/view/templates/exception.tpl
@@ -7,5 +7,7 @@
 {{$stack_trace}}
 {{$trace}}</pre>
 {{/if}}
+{{if $back}}
 	<p><button type="button" onclick="window.history.back()" class="btn btn-primary">{{$back}}</button></p>
+{{/if}}
 </div>