diff --git a/lib/pleroma/gun/gun.ex b/lib/pleroma/gun/gun.ex
index 81855e89e..4043e4880 100644
--- a/lib/pleroma/gun/gun.ex
+++ b/lib/pleroma/gun/gun.ex
@@ -11,6 +11,10 @@ defmodule Pleroma.Gun do
   @callback await(pid(), reference()) :: {:response, :fin, 200, []}
   @callback set_owner(pid(), pid()) :: :ok
 
+  @api Pleroma.Config.get([Pleroma.Gun], Pleroma.Gun.API)
+
+  defp api, do: @api
+
   def open(host, port, opts), do: api().open(host, port, opts)
 
   def info(pid), do: api().info(pid)
@@ -24,6 +28,4 @@ defmodule Pleroma.Gun do
   def await(pid, ref), do: api().await(pid, ref)
 
   def set_owner(pid, owner), do: api().set_owner(pid, owner)
-
-  defp api, do: Pleroma.Config.get([Pleroma.Gun], Pleroma.Gun.API)
 end
diff --git a/lib/pleroma/http/adapter_helper/gun.ex b/lib/pleroma/http/adapter_helper/gun.ex
index 5d5870d90..9b03f4653 100644
--- a/lib/pleroma/http/adapter_helper/gun.ex
+++ b/lib/pleroma/http/adapter_helper/gun.ex
@@ -5,10 +5,9 @@
 defmodule Pleroma.HTTP.AdapterHelper.Gun do
   @behaviour Pleroma.HTTP.AdapterHelper
 
-  alias Pleroma.HTTP.AdapterHelper
-
   require Logger
 
+  alias Pleroma.HTTP.AdapterHelper
   alias Pleroma.Pool.Connections
 
   @defaults [
@@ -22,20 +21,23 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do
 
   @spec options(keyword(), URI.t()) :: keyword()
   def options(connection_opts \\ [], %URI{} = uri) do
-    proxy = Pleroma.Config.get([:http, :proxy_url], nil)
+    formatted_proxy =
+      Pleroma.Config.get([:http, :proxy_url], nil)
+      |> AdapterHelper.format_proxy()
+
+    config_opts = Pleroma.Config.get([:http, :adapter], [])
 
     @defaults
-    |> Keyword.merge(Pleroma.Config.get([:http, :adapter], []))
+    |> Keyword.merge(config_opts)
     |> add_scheme_opts(uri)
-    |> AdapterHelper.maybe_add_proxy(AdapterHelper.format_proxy(proxy))
+    |> AdapterHelper.maybe_add_proxy(formatted_proxy)
     |> maybe_get_conn(uri, connection_opts)
   end
 
   @spec after_request(keyword()) :: :ok
   def after_request(opts) do
-    with conn when not is_nil(conn) <- opts[:conn],
-         body_as when body_as != :chunks <- opts[:body_as] do
-      Connections.checkout(conn, self(), :gun_connections)
+    if opts[:conn] && opts[:body_as] != :chunks do
+      Connections.checkout(opts[:conn], self(), :gun_connections)
     end
 
     :ok