diff --git a/packages/babel-plugin-transform-es2015-classes/src/vanilla.js b/packages/babel-plugin-transform-es2015-classes/src/vanilla.js
index e877902385..ce480f5516 100644
--- a/packages/babel-plugin-transform-es2015-classes/src/vanilla.js
+++ b/packages/babel-plugin-transform-es2015-classes/src/vanilla.js
@@ -23,18 +23,17 @@ const noMethodVisitor = {
 };
 
 const verifyConstructorVisitor = visitors.merge([noMethodVisitor, {
-  Super(path, state) {
+  Super(path) {
     if (
       this.isDerived && !this.hasBareSuper &&
-      !path.parentPath.isCallExpression({ callee: path.node }) &&
-      !state.inArrowFunctionExpression
+      !path.parentPath.isCallExpression({ callee: path.node })
     ) {
-      throw path.buildCodeFrameError("'super.*' is not allowed before super()");
-    }
-  },
+      const hasArrowFunctionParent = path.findParent((p) => p.isArrowFunctionExpression());
 
-  ArrowFunctionExpression(path, state) {
-    state.inArrowFunctionExpression = true;
+      if (!hasArrowFunctionParent) {
+        throw path.buildCodeFrameError("'super.*' is not allowed before super()");
+      }
+    }
   },
 
   CallExpression: {
diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/actual.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/actual.js
new file mode 100644
index 0000000000..1d570b180f
--- /dev/null
+++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/actual.js
@@ -0,0 +1,7 @@
+class Foo extends Bar {
+  constructor() {
+    const t = () => super.test()
+    super.foo();
+    super();
+  }
+}
diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json
new file mode 100644
index 0000000000..fbca946296
--- /dev/null
+++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'super.*' is not allowed before super()"
+}