diff --git a/TODO.md b/TODO.md
index 56812ff..b9a996e 100644
--- a/TODO.md
+++ b/TODO.md
@@ -29,6 +29,11 @@
 - Add remote.endpoint (or .absoluteUrl ?)
 - AWS SDK (> v2.3.0) native support for promises https://blogs.aws.amazon.com/javascript/post/Tx3BZ2DC4XARUGG/Support-for-Promises-in-the-SDK
 
+## eslint-config-poosh
+
+- Setup generator-star-spacing when babel-eslint issue 316 will be fixed
+   - https://github.com/babel/babel-eslint/issues/316
+
 ## internal
 
 - Const nazification?
diff --git a/packages/eslint-config-poosh/base.json5 b/packages/eslint-config-poosh/base.json5
index 930a2fe..472ae77 100644
--- a/packages/eslint-config-poosh/base.json5
+++ b/packages/eslint-config-poosh/base.json5
@@ -217,7 +217,9 @@
 
     // ECMAScript 6
     "arrow-spacing": [2, { before: true, after: true }],
-    "generator-star-spacing": [2, "after"],
+    //"generator-star-spacing": [2, "after"],
+    //https://github.com/babel/babel-eslint/issues/316
+    "generator-star-spacing": 0,
     "no-class-assign": 2,
     "no-confusing-arrow": 2,
     "no-const-assign": 2,