diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js index 7bb08182f..dcf6e1a75 100644 --- a/graph/resolvers/asset.js +++ b/graph/resolvers/asset.js @@ -5,13 +5,11 @@ const Asset = { settings({settings = null}, _, {loaders}) { return loaders.Settings.load() .then((globalSettings) => { - if (settings) { - settings = Object.assign({}, settings, globalSettings.toObject()); + settings = Object.assign({}, globalSettings.toObject(), settings); } else { settings = globalSettings.toObject(); } - return settings; }); }