diff --git a/server/index.js b/server/index.js
index 4afc9816..de5e55fa 100644
--- a/server/index.js
+++ b/server/index.js
@@ -33,8 +33,6 @@ function buildManifest(srcManifest, options) {
     pluginsByName['./plugins/renderer/renderer.module'].storeUrl = storeUrl;
     pluginsByName['./plugins/renderer/renderer.module'].storeSettingsLocale =
         options.storeSettingsLocale;
-    pluginsByName['./plugins/renderer/renderer.module'].customLayouts =
-        options.dotStencilFile.customLayouts;
     pluginsByName['./plugins/theme-assets/theme-assets.module'].themePath = options.themePath;
 
     resManifest.register.plugins = _.reduce(
diff --git a/server/plugins/renderer/renderer.module.js b/server/plugins/renderer/renderer.module.js
index 922b3514..49d12baf 100644
--- a/server/plugins/renderer/renderer.module.js
+++ b/server/plugins/renderer/renderer.module.js
@@ -457,7 +457,9 @@ internals.buildReqHeaders = ({
         'stencil-custom-templates': templates,
     };
 
-    if (!request.headers['stencil-config'] && stencilConfig) {
+    const config = request.headers['stencil-config'];
+
+    if ((!config || config === '{}') && stencilConfig) {
         headers['stencil-config'] = JSON.stringify(stencilConfig);
     }
     // eslint-disable-next-line no-param-reassign