diff --git a/Gemfile b/Gemfile
index 2672939ca..1033ed55d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem 'groupdate'
 gem "chartkick"
 gem 'rubyzip', '>= 1.0.0'
 
-gem 'sidekiq', '< 5'
+gem 'sidekiq', '< 7'
 gem 'sidekiq-status'
 gem 'sidekiq-unique-jobs', '~> 4.0.17'
 gem 'redis-rails', '~> 4.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index a0fef66ec..90e1f40fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -142,8 +142,8 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     columnize (0.8.9)
-    concurrent-ruby (1.1.5)
-    connection_pool (2.2.0)
+    concurrent-ruby (1.1.10)
+    connection_pool (2.3.0)
     coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
@@ -332,7 +332,7 @@ GEM
     rack-cors (0.3.0)
     rack-livereload (0.3.11)
       rack
-    rack-protection (1.4.0)
+    rack-protection (1.5.5)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -355,7 +355,8 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     rake (10.0.4)
-    redis (3.3.0)
+    redis (5.0.5)
+      redis-client (>= 0.9.0)
     redis-actionpack (4.0.1)
       actionpack (~> 4)
       redis-rack (~> 1.5.0)
@@ -363,6 +364,8 @@ GEM
     redis-activesupport (4.1.5)
       activesupport (>= 3, < 5)
       redis-store (~> 1.1.0)
+    redis-client (0.11.2)
+      connection_pool
     redis-rack (1.5.1)
       rack (~> 1.5)
       redis-store (~> 1.1.0)
@@ -422,10 +425,11 @@ GEM
       thor (~> 0.14)
     sentient_user (0.3.3)
       railties (>= 3.1)
-    sidekiq (4.1.1)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      redis (~> 3.2, >= 3.2.1)
+    sidekiq (6.0.0.pre1)
+      connection_pool (>= 2.2.2)
+      rack (>= 1.5.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 4.0.2)
     sidekiq-status (0.6.0)
       sidekiq (>= 2.7)
     sidekiq-unique-jobs (4.0.18)
@@ -598,7 +602,7 @@ DEPENDENCIES
   rubyzip (>= 1.0.0)
   sass-rails (~> 5.0.0)
   select2-rails (~> 3.5.4)
-  sidekiq (< 5)
+  sidekiq (< 7)
   sidekiq-status
   sidekiq-unique-jobs (~> 4.0.17)
   simplecov