diff --git a/.changeset/early-turkeys-compete.md b/.changeset/early-turkeys-compete.md
new file mode 100644
index 00000000..f58d6bfd
--- /dev/null
+++ b/.changeset/early-turkeys-compete.md
@@ -0,0 +1,6 @@
+---
+"@solid-devtools/debugger": patch
+---
+
+Better handle solid.lazy
+Requires https://github.com/solidjs/solid/pull/2389
diff --git a/packages/debugger/src/structure/walker.ts b/packages/debugger/src/structure/walker.ts
index 4df4673c..6c94f029 100644
--- a/packages/debugger/src/structure/walker.ts
+++ b/packages/debugger/src/structure/walker.ts
@@ -162,6 +162,24 @@ function mapOwner(
 
         let first_owned: Solid.Owner | undefined
 
+        /*
+         solid.lazy(MyComponent) hoc
+          ↳ wrap (callback returned from lazy, called as a component)
+             ↳ memo
+                ↳ MyComponent
+        */
+        if (name === 'wrap' &&
+            typeof ((owner as Solid.Component).component as any)?.preload === 'function' &&
+            owner.owned &&
+            owner.owned.length === 1 &&
+            markOwnerType((first_owned = owner.owned[0]!)) === NodeType.Memo &&
+            first_owned.owned &&
+            first_owned.owned.length === 1 &&
+            markOwnerType((first_owned = first_owned.owned[0]!)) === NodeType.Component
+        ) {
+            return mapOwner(first_owned, parent)
+        }
+
         /* 
          Context