diff --git a/index.php b/index.php
index d98b6db73a..66b5f224ad 100644
--- a/index.php
+++ b/index.php
@@ -31,8 +31,6 @@ $a = \Friendica\App::fromDice($dice);
 
 $a->processRequest();
 
-\Friendica\DI::mode()->setExecutor(\Friendica\App\Mode::INDEX);
-
 $a->runFrontend(
 	$dice->create(\Friendica\App\Router::class),
 	$dice->create(\Friendica\Core\PConfig\Capability\IManagePersonalConfigValues::class),
diff --git a/src/App.php b/src/App.php
index 04520db2fe..b151f78b39 100644
--- a/src/App.php
+++ b/src/App.php
@@ -160,6 +160,8 @@ class App
 			$this->container->create(DbaDefinition::class),
 			$this->container->create(ViewDefinition::class),
 		);
+
+		$this->mode->setExecutor(Mode::INDEX);
 	}
 
 	/**