diff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb
index 96ab5ba619..b03fb2568f 100644
--- a/config/initializers/008-rack-cors.rb
+++ b/config/initializers/008-rack-cors.rb
@@ -45,6 +45,7 @@ class Discourse::Cors
       headers['Access-Control-Allow-Headers'] = 'Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization'
       headers['Access-Control-Allow-Credentials'] = 'true'
       headers['Access-Control-Allow-Methods'] = 'POST, PUT, GET, OPTIONS, DELETE'
+      headers['Access-Control-Max-Age'] = '7200'
     end
 
     headers
diff --git a/spec/components/hijack_spec.rb b/spec/components/hijack_spec.rb
index 0ed3b0b403..416ee4102b 100644
--- a/spec/components/hijack_spec.rb
+++ b/spec/components/hijack_spec.rb
@@ -110,7 +110,8 @@ describe Hijack do
       "Access-Control-Allow-Origin" => "www.rainbows.com",
       "Access-Control-Allow-Headers" => "Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization",
       "Access-Control-Allow-Credentials" => "true",
-      "Access-Control-Allow-Methods" => "POST, PUT, GET, OPTIONS, DELETE"
+      "Access-Control-Allow-Methods" => "POST, PUT, GET, OPTIONS, DELETE",
+      "Access-Control-Max-Age" => "7200",
     }
 
     expect(headers).to eq(expected)
@@ -147,7 +148,8 @@ describe Hijack do
       "Access-Control-Allow-Origin" => "https://www.rainbows.com",
       "Access-Control-Allow-Headers" => "Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization",
       "Access-Control-Allow-Credentials" => "true",
-      "Access-Control-Allow-Methods" => "POST, PUT, GET, OPTIONS, DELETE"
+      "Access-Control-Allow-Methods" => "POST, PUT, GET, OPTIONS, DELETE",
+      "Access-Control-Max-Age" => "7200",
     }
 
     expect(headers).to eq(expected)