diff --git a/src/Core/Addon/AddonHelper.php b/src/Core/Addon/AddonHelper.php
new file mode 100644
index 0000000000..7b65da64fe
--- /dev/null
+++ b/src/Core/Addon/AddonHelper.php
@@ -0,0 +1,21 @@
+<?php
+
+// Copyright (C) 2010-2024, the Friendica project
+// SPDX-FileCopyrightText: 2010-2024 the Friendica project
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+declare(strict_types=1);
+
+namespace Friendica\Core\Addon;
+
+/**
+ * Some functions to handle addons
+ */
+interface AddonHelper
+{
+	/**
+	 * Checks if the provided addon is enabled
+	 */
+	public function isEnabled(string $addonId): bool;
+}
diff --git a/src/Core/Addon/AddonProxy.php b/src/Core/Addon/AddonProxy.php
new file mode 100644
index 0000000000..9d1b1b0ea0
--- /dev/null
+++ b/src/Core/Addon/AddonProxy.php
@@ -0,0 +1,28 @@
+<?php
+
+// Copyright (C) 2010-2024, the Friendica project
+// SPDX-FileCopyrightText: 2010-2024 the Friendica project
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+declare(strict_types=1);
+
+namespace Friendica\Core\Addon;
+
+use Friendica\Core\Addon;
+
+/**
+ * Proxy to the Addon class
+ *
+ * @internal
+ */
+final class AddonProxy implements AddonHelper
+{
+	/**
+	 * Checks if the provided addon is enabled
+	 */
+	public function isEnabled(string $addonId): bool
+	{
+		return Addon::isEnabled($addonId);
+	}
+}
diff --git a/src/DI.php b/src/DI.php
index c9c973f722..8e27922829 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -8,6 +8,7 @@
 namespace Friendica;
 
 use Dice\Dice;
+use Friendica\Core\Addon\AddonHelper;
 use Friendica\Core\Logger\Capability\ICheckLoggerSettings;
 use Friendica\Core\Logger\LoggerManager;
 use Friendica\Core\Logger\Util\LoggerSettingsCheck;
@@ -280,6 +281,11 @@ abstract class DI
 		return self::$dice->create(Core\Storage\Repository\StorageManager::class);
 	}
 
+	public static function addonHelper(): AddonHelper
+	{
+		return self::$dice->create(AddonHelper::class);
+	}
+
 	/**
 	 * @return \Friendica\Core\System
 	 */
diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php
index 8ebf1f918d..c39ac0999a 100644
--- a/src/Module/Admin/Addons/Index.php
+++ b/src/Module/Admin/Addons/Index.php
@@ -35,8 +35,10 @@ class Index extends BaseAdmin
 					break;
 
 				case 'toggle' :
+					$addonHelper = DI::addonHelper();
+
 					$addon = $_GET['addon'] ?? '';
-					if (Addon::isEnabled($addon)) {
+					if ($addonHelper->isEnabled($addon)) {
 						Addon::uninstall($addon);
 						DI::sysmsg()->addInfo(DI::l10n()->t('Addon %s disabled.', $addon));
 					} elseif (Addon::install($addon)) {
diff --git a/static/dependencies.config.php b/static/dependencies.config.php
index f1c2f4e52e..c41200cb4e 100644
--- a/static/dependencies.config.php
+++ b/static/dependencies.config.php
@@ -42,6 +42,9 @@ return (function(string $basepath, array $getVars, array $serverVars, array $coo
 				[Dice::INSTANCE => Dice::SELF],
 			],
 		],
+		\Friendica\Core\Addon\AddonHelper::class => [
+			'instanceOf' => \Friendica\Core\Addon\AddonProxy::class,
+		],
 		\Friendica\Util\BasePath::class => [
 			'constructParams' => [
 				$basepath,