diff --git a/lib/pleroma/gun/connection_pool.ex b/lib/pleroma/gun/connection_pool.ex
index d3eead7d8..8b41a668c 100644
--- a/lib/pleroma/gun/connection_pool.ex
+++ b/lib/pleroma/gun/connection_pool.ex
@@ -53,7 +53,10 @@ defmodule Pleroma.Gun.ConnectionPool do
         {:ok, pid}
 
       {:DOWN, ^ref, :process, ^worker_pid, reason} ->
-        {:error, reason}
+        case reason do
+          {:shutdown, error} -> error
+          _ -> {:error, reason}
+        end
     end
   end
 
diff --git a/lib/pleroma/gun/connection_pool/worker.ex b/lib/pleroma/gun/connection_pool/worker.ex
index 16a508ad9..f33447cb6 100644
--- a/lib/pleroma/gun/connection_pool/worker.ex
+++ b/lib/pleroma/gun/connection_pool/worker.ex
@@ -31,7 +31,7 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
        :hibernate}
     else
       err ->
-        {:stop, err, nil}
+        {:stop, {:shutdown, err}, nil}
     end
   end