diff --git a/package.json b/package.json
index 9309373fd..3f3cec4fa 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
     "async": "^2.5.0",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
+    "babel-plugin-lodash": "^3.2.11",
     "babel-preset-env": "^1.6.0",
     "babel-preset-es2015": "^6.24.1",
     "clone": "^2.1.1",
diff --git a/src/diagrams/gitGraph/gitGraphAst.js b/src/diagrams/gitGraph/gitGraphAst.js
index dcedbb1bf..f47a86820 100644
--- a/src/diagrams/gitGraph/gitGraphAst.js
+++ b/src/diagrams/gitGraph/gitGraphAst.js
@@ -1,6 +1,7 @@
+import _ from 'lodash'
+
 const Logger = require('../../logger')
 const log = Logger.Log
-const _ = require('lodash')
 
 var commits = {}
 var head = null
diff --git a/src/diagrams/gitGraph/gitGraphRenderer.js b/src/diagrams/gitGraph/gitGraphRenderer.js
index 1c7cdb059..8214f31e6 100644
--- a/src/diagrams/gitGraph/gitGraphRenderer.js
+++ b/src/diagrams/gitGraph/gitGraphRenderer.js
@@ -1,5 +1,6 @@
+import _ from 'lodash'
+
 const db = require('./gitGraphAst')
-const _ = require('lodash')
 const gitGraphParser = require('./parser/gitGraph')
 const d3 = require('../../d3')
 const Logger = require('../../logger')
diff --git a/webpack.config.base.js b/webpack.config.base.js
index 0b6cbb87f..e8187f4ad 100644
--- a/webpack.config.base.js
+++ b/webpack.config.base.js
@@ -36,7 +36,8 @@ export const webConfig = () => {
                     'browsers': ['last 3 versions']
                   }
                 }]
-              ]
+              ],
+              plugins: ['lodash']
             }
           }
         }
diff --git a/yarn.lock b/yarn.lock
index 72cef6083..4884ade35 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -480,6 +480,13 @@ babel-plugin-check-es2015-constants@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-lodash@^3.2.11:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.2.11.tgz#21c8fdec9fe1835efaa737873e3902bdd66d5701"
+  dependencies:
+    glob "^7.1.1"
+    lodash "^4.17.2"
+
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -3611,7 +3618,7 @@ lodash@^3.10.0, lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
+lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"