diff --git a/src/Core/GNUsocial.php b/src/Core/GNUsocial.php
index f6ab5d67d4..f49a29df35 100644
--- a/src/Core/GNUsocial.php
+++ b/src/Core/GNUsocial.php
@@ -62,6 +62,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Core\Security as SSecurity;
 use Symfony\Component\Security\Http\Util\TargetPathTrait;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class GNUsocial implements EventSubscriberInterface
@@ -81,7 +82,7 @@ class GNUsocial implements EventSubscriberInterface
     protected SSecurity                $security;
     protected MailerInterface          $mailer;
     protected ModuleManager            $module_manager;
-
+    protected Httpclientinterface      $client;
     /**
      * Symfony dependency injection gives us access to these services
      */
@@ -96,7 +97,8 @@ class GNUsocial implements EventSubscriberInterface
                                 SessionInterface $sess,
                                 SSecurity $sec,
                                 MailerInterface $mail,
-                                ModuleManager $mm)
+                                ModuleManager $mm,
+                                HttpClientInterface $cl)
     {
         $this->logger           = $logger;
         $this->translator       = $trans;
@@ -110,6 +112,7 @@ class GNUsocial implements EventSubscriberInterface
         $this->security         = $sec;
         $this->mailer           = $mail;
         $this->module_manager   = $mm;
+        $this->client           = $cl;
 
         $this->initialize();
     }
@@ -131,6 +134,7 @@ class GNUsocial implements EventSubscriberInterface
             Security::setHelper($this->security);
             Mailer::setMailer($this->mailer);
             Router::setRouter($this->router, $this->url_generator);
+            HTTPClient::setClient($this->client);
 
             if (isset($_ENV['HTTPS']) || isset($_ENV['HTTP_HOST'])) {
                 DefaultSettings::setDefaults();
diff --git a/src/Core/HTTPClient.php b/src/Core/HTTPClient.php
new file mode 100644
index 0000000000..05a9763d63
--- /dev/null
+++ b/src/Core/HTTPClient.php
@@ -0,0 +1,36 @@
+<?php
+
+// {{{ License
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// GNU social is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+// }}}
+
+namespace App\Core;
+
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+abstract class HTTPClient
+{
+    private static ?Httpclientinterface $client;
+    public static function setClient(HttpClientInterface $client)
+    {
+        self::$client = $client;
+    }
+
+    public static function __callStatic(string $name, array $args)
+    {
+        return self::$client->{$name}(...$args);
+    }
+}