2 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/http/adapter_helper/gun.ex b/lib/pleroma/http/adapter_helper/gun.ex
index 9b03f4653..862e851c0 100644
--- a/lib/pleroma/http/adapter_helper/gun.ex
+++ b/lib/pleroma/http/adapter_helper/gun.ex
@@ -5,11 +5,11 @@
 defmodule Pleroma.HTTP.AdapterHelper.Gun do
   @behaviour Pleroma.HTTP.AdapterHelper
 
-  require Logger
-
   alias Pleroma.HTTP.AdapterHelper
   alias Pleroma.Pool.Connections
 
+  require Logger
+
   @defaults [
     connect_timeout: 5_000,
     domain_lookup_timeout: 5_000,
diff --git a/lib/pleroma/http/adapter_helper/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex
index a0e161eaa..d08afae0c 100644
--- a/lib/pleroma/http/adapter_helper/hackney.ex
+++ b/lib/pleroma/http/adapter_helper/hackney.ex
@@ -13,8 +13,10 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do
   def options(connection_opts \\ [], %URI{} = uri) do
     proxy = Pleroma.Config.get([:http, :proxy_url], nil)
 
+    config_opts = Pleroma.Config.get([:http, :adapter], [])
+
     @defaults
-    |> Keyword.merge(Pleroma.Config.get([:http, :adapter], []))
+    |> Keyword.merge(config_opts)
     |> Keyword.merge(connection_opts)
     |> add_scheme_opts(uri)
     |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)