diff --git a/config/babel.dev.js b/config/babel.dev.js
index 89096734713..2676b564507 100644
--- a/config/babel.dev.js
+++ b/config/babel.dev.js
@@ -25,7 +25,7 @@ module.exports = {
     // function x(a, b, c,) { }
     require.resolve('babel-plugin-syntax-trailing-function-commas'),
     // await fetch()
-    require.resolve('babel-plugin-syntax-async-functions'),
+    require.resolve('fast-async'),
     // class { handleClick = () => { } }
     require.resolve('babel-plugin-transform-class-properties'),
     // { ...todo, completed: true }
diff --git a/config/babel.prod.js b/config/babel.prod.js
index 92491bfcacb..34bb92cec71 100644
--- a/config/babel.prod.js
+++ b/config/babel.prod.js
@@ -22,7 +22,7 @@ module.exports = {
     // function x(a, b, c,) { }
     require.resolve('babel-plugin-syntax-trailing-function-commas'),
     // await fetch()
-    require.resolve('babel-plugin-syntax-async-functions'),
+    require.resolve('fast-async'),
     // class { handleClick = () => { } }
     require.resolve('babel-plugin-transform-class-properties'),
     // { ...todo, completed: true }
diff --git a/package.json b/package.json
index bf3d853af2a..2b5d8c3c157 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
     "babel-eslint": "6.1.2",
     "babel-jest": "14.1.0",
     "babel-loader": "6.2.4",
-    "babel-plugin-syntax-async-functions": "6.8.0",
     "babel-plugin-syntax-trailing-function-commas": "6.8.0",
     "babel-plugin-transform-class-properties": "6.11.5",
     "babel-plugin-transform-object-rest-spread": "6.8.0",
@@ -57,6 +56,7 @@
     "eslint-plugin-jsx-a11y": "2.0.1",
     "eslint-plugin-react": "5.2.2",
     "extract-text-webpack-plugin": "1.0.1",
+    "fast-async": "^6.0.31",
     "file-loader": "0.9.0",
     "filesize": "3.3.0",
     "fs-extra": "0.30.0",