diff --git a/elixir/apps/web/mix.exs b/elixir/apps/web/mix.exs
index 5c7c4cb66..2020fdea5 100644
--- a/elixir/apps/web/mix.exs
+++ b/elixir/apps/web/mix.exs
@@ -62,6 +62,7 @@ defmodule Web.MixProject do
       {:observer_cli, "~> 1.7"},
 
       # Mailer deps
+      {:hackney, "~> 1.20"},
       {:phoenix_swoosh, "~> 1.0"},
       {:gen_smtp, "~> 1.0"},
 
diff --git a/elixir/config/config.exs b/elixir/config/config.exs
index 004a53d65..e3455c843 100644
--- a/elixir/config/config.exs
+++ b/elixir/config/config.exs
@@ -201,7 +201,9 @@ config :logger, :console,
 # Use Jason for JSON parsing in Phoenix
 config :phoenix, :json_library, Jason
 
-config :swoosh, :api_client, Swoosh.ApiClient.Finch
+# TODO: This is buggy, the return value is different
+# from the one you would get with Hackney:
+# config :swoosh, :api_client, Swoosh.ApiClient.Finch
 
 config :web, Web.Mailer,
   adapter: Domain.Mailer.NoopAdapter,