diff --git a/src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php b/src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php
index 1ab84cf6..669b8137 100644
--- a/src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php
+++ b/src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php
@@ -30,11 +30,11 @@ final class Tos extends CMSPlugin implements SubscriberInterface
 	public static function getSubscribedEvents(): array
 	{
 		return [
-			'onAfterRoute' => 'onAfterRoute',
+			'onAfterInitialise' => 'onAfterInitialise',
 		];
 	}
 
-	public function onAfterRoute(): void
+	public function onAfterInitialise(): void
 	{
 		$app = $this->getApplication();
 
@@ -61,9 +61,17 @@ final class Tos extends CMSPlugin implements SubscriberInterface
 			$slugs = (array) $slugs;
 		}
 
+		// Default bypassed pages when none configured
 		if (empty($slugs))
 		{
-			return;
+			$slugs = [
+				'legal/terms-of-service',
+				'legal/privacy-policy',
+				'legal/community-guidelines',
+				'support',
+				'support/tickets',
+				'support/submit-a-ticket',
+			];
 		}
 
 		$includeChildren = (int) $this->params->get('include_children', 1);
@@ -167,6 +175,5 @@ final class Tos extends CMSPlugin implements SubscriberInterface
 	private function bypassOffline($config, $app): void
 	{
 		$config->set('offline', 0);
-		$app->getInput()->set('tmpl', 'component');
 	}
 }