diff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb
index ae160149503..96ab5ba6197 100644
--- a/config/initializers/008-rack-cors.rb
+++ b/config/initializers/008-rack-cors.rb
@@ -32,9 +32,8 @@ class Discourse::Cors
 
   def self.apply_headers(cors_origins, env, headers)
     request_method = env['REQUEST_METHOD']
-    cdn_endpoints = ["/assets", "/javascripts"]
 
-    if cdn_endpoints.include?(env['SCRIPT_NAME']) && Discourse.is_cdn_request?(env, request_method)
+    if env['REQUEST_PATH'] =~ /\/(javascripts|assets)\// && Discourse.is_cdn_request?(env, request_method)
       Discourse.apply_cdn_headers(headers)
     elsif cors_origins
       origin = nil