diff --git a/app/models/javascript_cache.rb b/app/models/javascript_cache.rb
index 3f9f72dd20..832a60f7e6 100644
--- a/app/models/javascript_cache.rb
+++ b/app/models/javascript_cache.rb
@@ -8,7 +8,7 @@ class JavascriptCache < ActiveRecord::Base
   before_save :update_digest
 
   def url
-    "#{GlobalSetting.cdn_url}#{GlobalSetting.relative_url_root}/theme-javascripts/#{digest}.js?__ws=#{Discourse.current_hostname}"
+    "#{GlobalSetting.cdn_url}#{Discourse.base_uri}/theme-javascripts/#{digest}.js?__ws=#{Discourse.current_hostname}"
   end
 
   private
diff --git a/lib/content_security_policy/default.rb b/lib/content_security_policy/default.rb
index 2526fc3c8d..d1daff3573 100644
--- a/lib/content_security_policy/default.rb
+++ b/lib/content_security_policy/default.rb
@@ -36,7 +36,7 @@ class ContentSecurityPolicy
         if can_use_s3_cdn && s3_cdn
           s3_cdn + dir
         elsif can_use_cdn && cdn
-          cdn + dir
+          cdn + Discourse.base_uri + dir
         else
           base + dir
         end