diff --git a/Gemfile b/Gemfile
index 1fc5567fe34..0b9d8dcff20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -127,6 +127,7 @@ end
 # Action Mailbox
 gem "aws-sdk-sns", require: false
 gem "webmock"
+gem "httpclient", github: "nahi/httpclient", branch: "master", require: false
 
 # Add your own local bundler stuff.
 local_gemfile = File.expand_path(".Gemfile", __dir__)
diff --git a/Gemfile.lock b/Gemfile.lock
index f7b7c0697e5..64c97c5242f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,13 @@ GIT
       event_emitter
       websocket
 
+GIT
+  remote: https://github.com/nahi/httpclient.git
+  revision: d57cc6d5ffee1b566b5c189fe6dc8cc89570b812
+  branch: master
+  specs:
+    httpclient (2.8.3)
+
 GIT
   remote: https://github.com/rails/sdoc.git
   revision: e9bb867eba81f48c402a129e688e810ec1fa387c
@@ -273,7 +280,6 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     hashdiff (1.1.0)
-    httpclient (2.8.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
@@ -603,6 +609,7 @@ DEPENDENCIES
   delayed_job
   delayed_job_active_record
   google-cloud-storage (~> 1.11)
+  httpclient!
   image_processing (~> 1.2)
   importmap-rails (>= 1.2.3)
   jbuilder