diff --git a/packages/chatkit-react/src/ChatKit.tsx b/packages/chatkit-react/src/ChatKit.tsx
index 1c8a90b..fae6617 100644
--- a/packages/chatkit-react/src/ChatKit.tsx
+++ b/packages/chatkit-react/src/ChatKit.tsx
@@ -63,13 +63,17 @@ export const ChatKit = React.forwardRef<OpenAIChatKit, ChatKitProps>(
 
       const controller = new AbortController();
       for (const eventName of EVENT_NAMES) {
-        el.addEventListener(eventName, (e) => {
-          const handlerName = EVENT_HANDLER_MAP[eventName];
-          const handler = control.handlers[handlerName];
-          if (typeof handler === 'function') {
-            handler(e.detail as any);
-          }
-        });
+        el.addEventListener(
+          eventName,
+          (e) => {
+            const handlerName = EVENT_HANDLER_MAP[eventName];
+            const handler = control.handlers[handlerName];
+            if (typeof handler === 'function') {
+              handler(e.detail as any);
+            }
+          },
+          { signal: controller.signal },
+        );
       }
       return () => {
         controller.abort();