diff --git a/client/.babelrc b/client/.babelrc
index 86c445f54..431d458d2 100644
--- a/client/.babelrc
+++ b/client/.babelrc
@@ -1,3 +1,4 @@
 {
+  "plugins": ["lodash"],
   "presets": ["es2015", "react"]
 }
diff --git a/client/package.json b/client/package.json
index 9a25ecf09..77b9b7d2f 100644
--- a/client/package.json
+++ b/client/package.json
@@ -41,6 +41,7 @@
     "babel-eslint": "5.0.0",
     "babel-jest": "17.0.2",
     "babel-loader": "6.2.8",
+    "babel-plugin-lodash": "3.2.10",
     "babel-preset-es2015": "6.18.0",
     "babel-preset-react": "6.16.0",
     "clean-webpack-plugin": "0.1.14",
diff --git a/client/webpack.local.config.js b/client/webpack.local.config.js
index 9eb6d26f8..0cdf1bbf9 100644
--- a/client/webpack.local.config.js
+++ b/client/webpack.local.config.js
@@ -36,10 +36,9 @@ module.exports = {
       './app/scripts/terminal-main',
       'webpack-hot-middleware/client'
     ],
-    vendors: ['babel-polyfill', 'classnames', 'dagre', 'filesize', 'immutable', 'lodash',
+    vendors: ['babel-polyfill', 'classnames', 'dagre', 'filesize', 'immutable',
       'moment', 'page', 'react', 'react-dom', 'react-motion', 'react-redux', 'redux',
-      'redux-thunk', 'reqwest', 'xterm',
-      'webpack-hot-middleware/client'
+      'redux-thunk', 'reqwest', 'xterm', 'webpack-hot-middleware/client'
     ]
   },
 
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index ae790879d..3d92669da 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -35,8 +35,8 @@ module.exports = {
     'terminal-app': './app/scripts/terminal-main',
     // keep only some in here, to make vendors and app bundles roughly same size
     vendors: ['babel-polyfill', 'classnames', 'immutable',
-      'lodash', 'react', 'react-dom', 'react-redux',
-      'redux', 'redux-thunk']
+      'react', 'react-dom', 'react-redux', 'redux', 'redux-thunk'
+    ]
   },
 
   output: {