diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb
index 947c377be7..12a5a46a84 100644
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -19,6 +19,12 @@ window.onload = function () {
     args[parts[0]] = decodeURIComponent(parts[1] || '');
   }
 
+  var mapnikOptions = {
+<% if Settings.key?(:tile_cdn_url) %>
+    url: <%= Settings.tile_cdn_url.to_json %>
+<% end %>
+  };
+
   var thunderforestOptions = {
 <% if Settings.key?(:thunderforest_key) %>
     apikey: <%= Settings.thunderforest_key.to_json %>
@@ -30,7 +36,7 @@ window.onload = function () {
   map.removeControl(map.attributionControl);
 
   if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") {
-    new L.OSM.Mapnik().addTo(map);
+    new L.OSM.Mapnik(mapnikOptions).addTo(map);
   } else if (args.layer === "cyclemap" || args.layer === "cycle map") {
     new L.OSM.CycleMap(thunderforestOptions).addTo(map);
   } else if (args.layer === "transportmap") {
diff --git a/config/settings.yml b/config/settings.yml
index e5e6c37886..0ce0bf0b71 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -129,3 +129,5 @@ csp_enforce: false
 storage_service: "local"
 # Root URL for storage service
 # storage_url:
+# URL for tile CDN
+#tile_cdn_url: ""