diff --git a/Gemfile b/Gemfile
index c98b11262..240c70efb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,24 +9,25 @@ gem 'rails', '>= 5.0.0', '< 5.1'
 gem 'haml'
 gem 'inline_svg'
 gem 'jbuilder', '~> 2.0'
+gem 'markerb'
+gem 'multi_json'
 gem 'oj'
 gem 'oj_mimic_json'
-gem 'multi_json'
-gem 'markerb'
 gem 'redcarpet'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'webpacker', git: 'https://github.com/rails/webpacker'
 
-gem 'jquery-rails'
 gem 'bourbon'
 gem 'coffee-rails', '~> 4.1.0'
+gem 'jquery-rails'
 
+gem 'connection_pool'
 gem 'dalli'
 gem 'redis', '~> 3.0'
 
-gem 'lograge'
 gem 'awesome_print'
+gem 'lograge'
 gem 'newrelic_rpm'
 gem 'scout_apm'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 00971e38a..af1a27432 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,6 +113,7 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.2)
+    connection_pool (2.2.1)
     dalli (2.7.6)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
@@ -395,6 +396,7 @@ DEPENDENCIES
   byebug
   capybara
   coffee-rails (~> 4.1.0)
+  connection_pool
   dalli
   database_cleaner
   devise (~> 4.1)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2770205b8..9e40e23d4 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -61,7 +61,8 @@
                          failover: true,
                          socket_timeout: 1.5,
                          socket_failure_delay: 0.2,
-                         down_retry_delay: 60 }
+                         down_retry_delay: 60,
+                         pool_size: ENV.fetch('RAILS_MAX_THREADS') { 5 }.to_i }
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque