diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 66d499f54fede..7f1ad8211cb84 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -1291,12 +1291,13 @@ private boolean inClassWithinLambda() {
          * in nested scopes (which do not need to undergo capture).
          */
         private JCTree capturedDecl(int depth, Symbol sym) {
+            Assert.check(sym.kind != TYP);
             int currentDepth = frameStack.size() - 1;
             for (Frame block : frameStack) {
                 switch (block.tree.getTag()) {
                     case CLASSDEF:
                         ClassSymbol clazz = ((JCClassDecl)block.tree).sym;
-                        if (clazz.isSubClass(sym, types) || sym.isMemberOf(clazz, types)) {
+                        if (clazz.isSubClass(sym.enclClass(), types)) {
                             return currentDepth > depth ? null : block.tree;
                         }
                         break;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index 1ac62183bbe03..7c7db6de0863b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -1828,11 +1828,10 @@ JCExpression makeOuterThis(DiagnosticPosition pos, TypeSymbol c) {
      *                       due to protection?
      */
     JCExpression makeOwnerThis(DiagnosticPosition pos, Symbol sym, boolean preciseMatch) {
-        Symbol c = sym.owner;
         if (preciseMatch ? sym.isMemberOf(currentClass, types)
                          : currentClass.isSubClass(sym.owner, types)) {
             // in this case, `this' works fine
-            return make.at(pos).This(c.erasure(types));
+            return make.at(pos).This(currentClass.erasure(types));
         } else {
             // need to go via this$n
             return makeOwnerThisN(pos, sym, preciseMatch);
diff --git a/test/langtools/tools/javac/lambda/SuperClassThisCapture/SuperClassThisCapture.java b/test/langtools/tools/javac/lambda/SuperClassThisCapture/SuperClassThisCapture.java
new file mode 100644
index 0000000000000..1b553c42cdc21
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/SuperClassThisCapture/SuperClassThisCapture.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2024, Alphabet LLC. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8336786
+ * @summary VerifyError with lambda capture and enclosing instance references
+ * @compile a/A.java SuperClassThisCapture.java
+ * @run main SuperClassThisCapture
+ */
+
+public class SuperClassThisCapture extends a.A {
+
+  public static void main(String[] args) {
+    new SuperClassThisCapture().f(42);
+    new SuperClassThisCapture().g();
+  }
+
+  public void f(int x) {
+    Runnable r = () -> {
+      System.err.println(x);
+      new I();
+    };
+    r.run();
+  }
+
+  public void g() {
+    Runnable r = () -> new I();
+    r.run();
+  }
+}
diff --git a/test/langtools/tools/javac/lambda/SuperClassThisCapture/a/A.java b/test/langtools/tools/javac/lambda/SuperClassThisCapture/a/A.java
new file mode 100644
index 0000000000000..71855b894309a
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/SuperClassThisCapture/a/A.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024, Alphabet LLC. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package a;
+
+public class A {
+  public class I {}
+}