diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index dedb522e..24bb90fe 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -1364,8 +1364,22 @@ pub fn removeElementIdWithMaps(self: *Frame, id_maps: ElementIdMaps, id: []const
 
 pub fn getElementByIdFromNode(self: *Frame, node: *Node, id: []const u8) ?*Element {
     if (node.isConnected() or node.isInShadowTree()) {
-        const lookup = self.getElementIdMap(node).lookup;
-        return lookup.get(id);
+        var current = node;
+        while (true) {
+            if (current.is(ShadowRoot)) |shadow_root| {
+                return shadow_root.getElementById(id, self);
+            }
+            const parent = current._parent orelse {
+                if (current._type == .document) {
+                    return current._type.document.getElementById(id, self);
+                }
+                if (IS_DEBUG) {
+                    std.debug.assert(false);
+                }
+                return null;
+            };
+            current = parent;
+        }
     }
     var tw = @import("webapi/TreeWalker.zig").Full.Elements.init(node, .{});
     while (tw.next()) |el| {
diff --git a/src/browser/tests/element/duplicate_ids.html b/src/browser/tests/element/duplicate_ids.html
index 52ef7da6..2e8b5894 100644
--- a/src/browser/tests/element/duplicate_ids.html
+++ b/src/browser/tests/element/duplicate_ids.html
@@ -17,3 +17,24 @@
 
   // testing.expectEqual(null, document.getElementById('test'));
 </script>
+
+<div id="qs-test">first</div>
+<div id="qs-test">second</div>
+
+<script id=duplicateIdsQuerySelector>
+{
+  // Regression test: querySelector('#id') must agree with getElementById('id')
+  // when the first duplicate is removed. Selector engine fast path goes through
+  // Frame.getElementByIdFromNode, which previously only checked the lookup map
+  // and missed the _removed_ids recovery, so it returned null.
+  const first = document.querySelector('#qs-test');
+  testing.expectEqual('first', first.textContent);
+
+  first.remove();
+
+  testing.expectEqual('second', document.querySelector('#qs-test').textContent);
+  testing.expectEqual('second', document.body.querySelector('#qs-test').textContent);
+  testing.expectEqual(1, document.querySelectorAll('#qs-test').length);
+  testing.expectEqual('second', document.getElementById('qs-test').textContent);
+}
+</script>