diff --git a/packages/build-tools/cli.js b/packages/build-tools/cli.js
index f7f1af9e4a..d5fbe04113 100755
--- a/packages/build-tools/cli.js
+++ b/packages/build-tools/cli.js
@@ -118,12 +118,13 @@ if (program.configFile) {
         // automatically set enableSSR to true in prod mode and false in dev mode, unless manually set.
         config.enableSSR = false;
 
+        // automatically enable i18n in production builds if undefined
         config.i18n =
-          typeof options.i18n === 'undefined'
-            ? config.prod
-              ? true
-              : false
-            : options.i18n;
+          typeof options.i18n !== 'undefined'
+            ? options.i18n
+            : config.prod
+            ? true
+            : false;
 
         // If i18n is disabled, ignore and remove lang config settings
         if (config.lang && config.i18n === false) {
diff --git a/packages/build-tools/create-webpack-config.js b/packages/build-tools/create-webpack-config.js
index 6258d54896..927af14cec 100644
--- a/packages/build-tools/create-webpack-config.js
+++ b/packages/build-tools/create-webpack-config.js
@@ -232,6 +232,7 @@ async function createWebpackConfig(buildConfig) {
         functions: sassExportData,
         precision: 3,
         data: globalSassData.join('\n'),
+        outputStyle: 'nested',
       },
     },
   ];