diff --git a/src/App.php b/src/App.php
index ffcbfd1544..b10e474885 100644
--- a/src/App.php
+++ b/src/App.php
@@ -18,7 +18,6 @@ use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Capabilities\ICanHandleRequests;
 use Friendica\Content\Nav;
 use Friendica\Core\Addon\AddonHelper;
-use Friendica\Core\Addon\Capability\ICanLoadAddons;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Container;
 use Friendica\Core\Hooks\HookEventBridge;
@@ -278,11 +277,15 @@ class App
 
 	private function setupContainerForAddons(): void
 	{
-		/** @var ICanLoadAddons $addonLoader */
-		$addonLoader = $this->container->create(ICanLoadAddons::class);
+		/** @var AddonHelper $addonHelper */
+		$addonHelper = $this->container->create(AddonHelper::class);
 
-		foreach ($addonLoader->getActiveAddonConfig('dependencies') as $name => $rule) {
-			$this->container->addRule($name, $rule);
+		$addonHelper->loadAddons();
+
+		foreach ($addonHelper->getEnabledAddons() as $addonId) {
+			foreach ($addonHelper->getAddonDependencyConfig($addonId) as $name => $rule) {
+				$this->container->addRule($name, $rule);
+			}
 		}
 	}
 
diff --git a/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php
index f06e0b09e9..3349f36fd6 100644
--- a/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php
+++ b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php
@@ -7,7 +7,6 @@
 
 namespace Friendica\Test\src\Core\Hooks\Util;
 
-use Friendica\Core\Addon\Capability\ICanLoadAddons;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hooks\Capability\ICanRegisterStrategies;
 use Friendica\Core\Hooks\Exceptions\HookConfigException;