diff --git a/src/App.php b/src/App.php
index 7ff13e3e1b..9202e80129 100644
--- a/src/App.php
+++ b/src/App.php
@@ -222,7 +222,8 @@ class App
 
 		$this->setupContainerForLogger(LogChannel::DAEMON);
 
-		DI::init($this->container);
+		$this->setupLegacyServerLocator();
+
 		\Friendica\Core\Logger\Handler\ErrorHandler::register($this->container->create(LoggerInterface::class));
 
 		if (DI::mode()->isInstall()) {