diff --git a/CHANGELOG b/CHANGELOG
index 389e5787e5ffe48c90d7a751ab1c723d3e76fa26..bc19048e94b9d5a74400fbaa0ee6edc040f19540 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -156,6 +156,7 @@ v 8.12.0 (unreleased)
   - Add notification_settings API calls !5632 (mahcsig)
   - Remove duplication between project builds and admin builds view !5680 (Katarzyna Kobierska Ula Budziszewska)
   - Fix URLs with anchors in wiki !6300 (houqp)
+  - Use a ConnectionPool for Rails.cache on Sidekiq servers
   - Deleting source project with existing fork link will close all related merge requests !6177 (Katarzyna Kobierska Ula Budziszeska)
   - Return 204 instead of 404 for /ci/api/v1/builds/register.json if no builds are scheduled for a runner !6225
   - Fix Gitlab::Popen.popen thread-safety issue
diff --git a/config/application.rb b/config/application.rb
index 4792f6670a817636c44692f78633ed3d2bea39bd..8166b6003f6b6f7a44fb677ca8a22655a37fba07 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -116,6 +116,10 @@ module Gitlab
     redis_config_hash = Gitlab::Redis.params
     redis_config_hash[:namespace] = Gitlab::Redis::CACHE_NAMESPACE
     redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
+    if Sidekiq.server? # threaded context
+      redis_config_hash[:pool_size] = Sidekiq.options[:concurrency] + 5
+      redis_config_hash[:pool_timeout] = 1
+    end
     config.cache_store = :redis_store, redis_config_hash
 
     config.active_record.raise_in_transactional_callbacks = true