diff --git a/.babelrc b/.babelrc
index 0cb0bd16047..66742d7038c 100644
--- a/.babelrc
+++ b/.babelrc
@@ -6,5 +6,5 @@
         ["react-intl", {
             "messagesDir": "./translations/messages/"
         }]],
-    "presets": ["es2015", "react"]
+    "presets": [["env", {"targets": {browsers: ["last 3 versions", "Safari >= 8", "iOS >= 8"]}}], "react"]
 }
diff --git a/package.json b/package.json
index 94658acec5d..e9f26be5015 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.22.0",
-    "babel-preset-es2015": "^6.22.0",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.22.0",
     "buffer-loader": "0.0.1",
     "chromedriver": "2.38.2",