diff --git a/lib/pleroma/emails/mailer.ex b/lib/pleroma/emails/mailer.ex
index 58ef7de94..fa6fd8020 100644
--- a/lib/pleroma/emails/mailer.ex
+++ b/lib/pleroma/emails/mailer.ex
@@ -36,11 +36,10 @@ defmodule Pleroma.Emails.Mailer do
   def deliver(email, config \\ [])
 
   def deliver(email, config) do
-    # temporary hackney fix until hackney max_connections bug is fixed
-    # https://git.pleroma.social/pleroma/pleroma/-/issues/2101
+    # Swoosh HTTP adapters use Hackney, which otherwise trusts its certifi bundle
     email =
       Swoosh.Email.put_private(email, :hackney_options,
-        ssl_options: Pleroma.HTTP.TLS.ssl_options(versions: [:"tlsv1.2"])
+        ssl_options: Pleroma.HTTP.TLS.ssl_options()
       )
 
     case enabled?() do
diff --git a/test/pleroma/emails/mailer_test.exs b/test/pleroma/emails/mailer_test.exs
index 52b9c0687..2c2b5a4af 100644
--- a/test/pleroma/emails/mailer_test.exs
+++ b/test/pleroma/emails/mailer_test.exs
@@ -59,6 +59,6 @@ defmodule Pleroma.Emails.MailerTest do
     assert_received {:email, %Swoosh.Email{private: %{hackney_options: hackney_options}}}
 
     assert hackney_options[:ssl_options] ==
-             Pleroma.HTTP.TLS.ssl_options(versions: [:"tlsv1.2"])
+             Pleroma.HTTP.TLS.ssl_options()
   end
 end
diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs
index f5e6e20fe..ec5a2a12a 100644
--- a/test/pleroma/user_test.exs
+++ b/test/pleroma/user_test.exs
@@ -531,10 +531,8 @@ defmodule Pleroma.UserTest do
       ObanHelpers.perform_all()
 
       Pleroma.Emails.UserEmail.account_confirmation_email(registered_user)
-      # temporary hackney fix until hackney max_connections bug is fixed
-      # https://git.pleroma.social/pleroma/pleroma/-/issues/2101
       |> Swoosh.Email.put_private(:hackney_options,
-        ssl_options: Pleroma.HTTP.TLS.ssl_options(versions: [:"tlsv1.2"])
+        ssl_options: Pleroma.HTTP.TLS.ssl_options()
       )
       |> assert_email_sent()
     end
diff --git a/test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs b/test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
index 07288caa8..aa38a7454 100644
--- a/test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
@@ -1042,10 +1042,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
       ObanHelpers.perform_all()
 
       Pleroma.Emails.UserEmail.account_confirmation_email(first_user)
-      # temporary hackney fix until hackney max_connections bug is fixed
-      # https://git.pleroma.social/pleroma/pleroma/-/issues/2101
       |> Swoosh.Email.put_private(:hackney_options,
-        ssl_options: Pleroma.HTTP.TLS.ssl_options(versions: [:"tlsv1.2"])
+        ssl_options: Pleroma.HTTP.TLS.ssl_options()
       )
       |> assert_email_sent()
     end