diff --git a/Gemfile b/Gemfile
index 33850307c7..d79e7b9041 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,7 @@ gem 'private_address_check'# Rails 5 upgrade
 gem 'progress_bar'
 gem 'psych'
 gem 'puma'
-gem 'rack', '< 3.0.0' # Rack >= 3 causes errors when running functional tests that call multiple actions in a single test
+gem 'rack', '< 4.0.0' # Rack >= 3 causes errors when running functional tests that call multiple actions in a single test
 gem 'rack-attack'
 gem 'rack-cors', require: 'rack/cors'
 gem 'rails-html-sanitizer'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a41331345..fc0d2f927e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -621,7 +621,7 @@ GEM
       nio4r (~> 2.0)
     pyu-ruby-sasl (0.0.3.3)
     racc (1.8.1)
-    rack (2.2.13)
+    rack (3.1.12)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)
@@ -635,16 +635,17 @@ GEM
       faraday-follow_redirects
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (3.2.0)
+    rack-protection (4.1.1)
       base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
-    rack-session (1.0.2)
-      rack (< 3)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
+    rackup (2.2.1)
+      rack (>= 3)
     rails (7.2.2.1)
       actioncable (= 7.2.2.1)
       actionmailbox (= 7.2.2.1)
@@ -1124,7 +1125,7 @@ DEPENDENCIES
   pry-remote
   psych
   puma
-  rack (< 3.0.0)
+  rack (< 4.0.0)
   rack-attack
   rack-cors
   rack-mini-profiler