diff --git a/client/build/webpack.base.conf.js b/client/build/webpack.base.conf.js
index 47131265..a42b82db 100644
--- a/client/build/webpack.base.conf.js
+++ b/client/build/webpack.base.conf.js
@@ -100,7 +100,7 @@ module.exports = {
           {
             loader: 'sass-loader',
             options: {
-              data: `@import "styles/themes/_whitelabel.scss";`
+              data: process.env.THEME ? `@import "styles/themes/_${process.env.THEME}.scss";` : ''
             }
           }
         ]
diff --git a/client/build/webpack.prod.conf.js b/client/build/webpack.prod.conf.js
index d5448259..e9bde617 100644
--- a/client/build/webpack.prod.conf.js
+++ b/client/build/webpack.prod.conf.js
@@ -14,13 +14,6 @@ const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 const env = require('../config/prod.env')
 
 const webpackConfig = merge(baseWebpackConfig, {
-  module: {
-    rules: utils.styleLoaders({
-      sourceMap: config.build.productionSourceMap,
-      extract: true,
-      usePostCSS: true
-    })
-  },
   devtool: config.build.productionSourceMap ? config.build.devtool : false,
   output: {
     path: config.build.assetsRoot,