diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 6cb35331..6f47bf51 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -6,7 +6,6 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
-use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -71,7 +70,9 @@ function libravatar_addon_admin(string &$o)
 		'pagan' => DI::l10n()->t('retro adventure game character'),
 	];
 
-	if (Addon::isEnabled('gravatar')) {
+	$addonHelper = DI::addonHelper();
+
+	if ($addonHelper->isAddonEnabled('gravatar')) {
 		$o = '<h5>' .DI::l10n()->t('Information') .'</h5><p>' .DI::l10n()->t('Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>';
 	}
 
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index c3445b48..2d6937e8 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -627,7 +626,9 @@ function pumpio_action(int $uid, string $uri, string $action, string $content =
 
 function pumpio_sync()
 {
-	if (!Addon::isEnabled('pumpio')) {
+	$addonHelper = DI::addonHelper();
+
+	if (!$addonHelper->isAddonEnabled('pumpio')) {
 		return;
 	}