diff --git a/src/serve_data.js b/src/serve_data.js
index c86eb4d..7b55f60 100644
--- a/src/serve_data.js
+++ b/src/serve_data.js
@@ -13,9 +13,9 @@ module.exports = function(options, repo, params, id) {
   var app = express().disable('x-powered-by');
 
   var mbtilesFile = path.resolve(options.paths.mbtiles, params.mbtiles);
+  var baseURL = options.baseURL;
   var tileJSON = {
-    'tiles': params.domains || options.domains,
-    'baseURL': options.baseURL
+    'tiles': params.domains || options.domains
   };
 
   repo[id] = tileJSON;
@@ -82,7 +82,7 @@ module.exports = function(options, repo, params, id) {
   app.get('/' + id + '.json', function(req, res, next) {
     var info = clone(tileJSON);
     info.tiles = utils.getTileUrls(req, info.tiles,
-                                   'data/' + id, info.format);
+                                   'data/' + id, info.format, baseURL);
     return res.send(info);
   });
 
diff --git a/src/serve_style.js b/src/serve_style.js
index 06b3b6d..95690ae 100644
--- a/src/serve_style.js
+++ b/src/serve_style.js
@@ -59,9 +59,8 @@ module.exports = function(options, repo, params, id, reportTiles, reportFont) {
       if (!opt_nokey && req.query.key) {
         query = '?key=' + req.query.key;
       }
-      var url = baseURL ? baseURL : req.protocol + '://' + req.headers.host;
-      return url.replace(
-          'local://', url + '/') + query;
+      return url.replace('local://',
+        (baseURL ? baseURL : req.protocol + '://' + req.headers.host) + '/') + query;
     };
 
     var styleJSON_ = clone(styleJSON);
diff --git a/src/server.js b/src/server.js
index 3c2e0d5..190d578 100644
--- a/src/server.js
+++ b/src/server.js
@@ -255,6 +255,7 @@ module.exports = function(opts, callback) {
             req, style.serving_rendered.tiles,
             'styles/' + id + '/rendered', style.serving_rendered.format, baseURL);
         style.xyz_link = tiles[0];
+        style.baseURL = baseURL;
       }
     });
     var data = clone(serving.data || {});
@@ -296,6 +297,7 @@ module.exports = function(opts, callback) {
           size /= 1024;
         }
         data_.formatted_filesize = size.toFixed(2) + ' ' + suffix;
+        data_.baseURL = baseURL;
       }
     });
     return {