diff --git a/lib/utils/withErrorBoundary.test.tsx b/lib/utils/withErrorBoundary.test.tsx
index 940be2f8..a4f585e2 100644
--- a/lib/utils/withErrorBoundary.test.tsx
+++ b/lib/utils/withErrorBoundary.test.tsx
@@ -1,8 +1,16 @@
-import { Component, createRef, type PropsWithChildren } from "react";
+import {
+  Component,
+  createRef,
+  forwardRef,
+  useImperativeHandle,
+  type PropsWithChildren,
+  type Ref,
+} from "react";
 import { createRoot } from "react-dom/client";
 import { act } from "react-dom/test-utils";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { withErrorBoundary } from "./withErrorBoundary";
+import { assert } from "./assert";
 
 describe("withErrorBoundary", () => {
   let container: HTMLDivElement;
@@ -56,26 +64,82 @@ describe("withErrorBoundary", () => {
   it("should forward refs", () => {
     type Props = { foo: string };
 
-    class Inner extends Component<Props> {
-      test() {
-        // No-op
+    class TestClassComponent extends Component<Props> {
+      getFoo() {
+        return this.props.foo;
       }
       render() {
-        return this.props.foo;
+        return null;
       }
     }
 
-    const Wrapped = withErrorBoundary(Inner, {
+    const Wrapped = withErrorBoundary(TestClassComponent, {
+      fallback: <div>Error</div>,
+    });
+
+    const ref = createRef<TestClassComponent>();
+
+    act(() => {
+      root.render(<Wrapped foo="abc" ref={ref} />);
+    });
+
+    assert(ref.current !== null);
+    expect(ref.current.getFoo()).toBe("abc");
+  });
+
+  it("should forward refs to a function component that takes a ref prop", () => {
+    type Handle = { getFoo: () => string };
+
+    function TestFunctionComponent({
+      foo,
+      ref,
+    }: {
+      foo: string;
+      ref?: Ref<Handle>;
+    }) {
+      useImperativeHandle(ref, () => ({
+        getFoo: () => foo,
+      }));
+      return foo;
+    }
+
+    const Wrapped = withErrorBoundary(TestFunctionComponent, {
+      fallback: <div>Error</div>,
+    });
+
+    const ref = createRef<Handle>();
+
+    act(() => {
+      root.render(<Wrapped foo="abc" ref={ref} />);
+    });
+
+    assert(ref.current !== null);
+    expect(ref.current.getFoo()).toBe("abc");
+  });
+
+  it("should forward refs to a function using forwardRef", () => {
+    type Handle = { getFoo: () => string };
+
+    const TestForwardRefComponent = forwardRef(
+      ({ foo }: { foo: string }, ref: Ref<Handle>) => {
+        useImperativeHandle(ref, () => ({
+          getFoo: () => foo,
+        }));
+        return null;
+      },
+    );
+
+    const Wrapped = withErrorBoundary(TestForwardRefComponent, {
       fallback: <div>Error</div>,
     });
 
-    const ref = createRef<Inner>();
+    const ref = createRef<Handle>();
 
     act(() => {
       root.render(<Wrapped foo="abc" ref={ref} />);
     });
 
-    expect(ref.current).not.toBeNull();
-    expect(typeof ref.current?.test).toBe("function");
+    assert(ref.current !== null);
+    expect(ref.current.getFoo()).toBe("abc");
   });
 });
diff --git a/lib/utils/withErrorBoundary.ts b/lib/utils/withErrorBoundary.ts
index 2204860f..c9911333 100644
--- a/lib/utils/withErrorBoundary.ts
+++ b/lib/utils/withErrorBoundary.ts
@@ -1,17 +1,22 @@
 import {
   createElement,
   forwardRef,
-  type ComponentClass,
+  type ComponentProps,
+  type ComponentRef,
   type ComponentType,
 } from "react";
 import { ErrorBoundary } from "../components/ErrorBoundary";
 import type { ErrorBoundaryProps } from "../types";
 
 export function withErrorBoundary<
-  Type extends ComponentClass<unknown>,
-  Props extends object,
->(Component: ComponentType<Props>, errorBoundaryProps: ErrorBoundaryProps) {
-  const Wrapped = forwardRef<InstanceType<Type>, Props>((props, ref) =>
+  // ComponentProps and ComponentRef are themselves constrained by
+  // JSXElementConstructor<any>, so the parameter they read has to be too.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  Type extends ComponentType<any>,
+>(Component: Type, errorBoundaryProps: ErrorBoundaryProps) {
+  type Props = ComponentProps<Type>;
+
+  const Wrapped = forwardRef<ComponentRef<Type>, Props>((props, ref) =>
     createElement(
       ErrorBoundary,
       errorBoundaryProps,