diff --git a/lib/cartodb/models/mapconfig_named_layers_adapter.js b/lib/cartodb/models/mapconfig_named_layers_adapter.js
index ceb9c429..8ab5627d 100644
--- a/lib/cartodb/models/mapconfig_named_layers_adapter.js
+++ b/lib/cartodb/models/mapconfig_named_layers_adapter.js
@@ -11,6 +11,10 @@ module.exports = MapConfigNamedLayersAdapter;
 MapConfigNamedLayersAdapter.prototype.getLayers = function(username, layers, dbMetadata, callback) {
     var self = this;
 
+    if (!layers) {
+        return callback(null);
+    }
+
     var adaptLayersQueue = queue(layers.length);
 
     function adaptLayer(layer, done) {
diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index ceb825ce..390612fc 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -219,7 +219,9 @@ module.exports = function(serverOptions) {
                         return callback(err);
                     }
 
-                    requestMapConfig.layers = layers;
+                    if (layers) {
+                        requestMapConfig.layers = layers;
+                    }
                     return callback(null, requestMapConfig, datasource);
                 }
             );