diff --git a/packages/livekit-rtc/package.json b/packages/livekit-rtc/package.json
index 6bf684ec..dd0cc4ee 100644
--- a/packages/livekit-rtc/package.json
+++ b/packages/livekit-rtc/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@bufbuild/protobuf": "^1.4.2",
-    "typed-emitter": "^2.1.0"
+    "@livekit/typed-emitter": "^3.0.0"
   },
   "devDependencies": {
     "@napi-rs/cli": "^2.18.0",
diff --git a/packages/livekit-rtc/src/audio_stream.ts b/packages/livekit-rtc/src/audio_stream.ts
index 7c44bbc4..2bd5ae0c 100644
--- a/packages/livekit-rtc/src/audio_stream.ts
+++ b/packages/livekit-rtc/src/audio_stream.ts
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import EventEmitter from 'events';
-import type TypedEmitter from 'typed-emitter';
+import type { TypedEventEmitter as TypedEmitter } from '@livekit/typed-emitter';
 import { AudioFrame } from './audio_frame.js';
 import type { FfiEvent } from './ffi_client.js';
 import { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';
diff --git a/packages/livekit-rtc/src/ffi_client.ts b/packages/livekit-rtc/src/ffi_client.ts
index 577d99f1..410116e1 100644
--- a/packages/livekit-rtc/src/ffi_client.ts
+++ b/packages/livekit-rtc/src/ffi_client.ts
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import type { PartialMessage } from '@bufbuild/protobuf';
 import EventEmitter from 'events';
-import type TypedEmitter from 'typed-emitter';
+import type { TypedEventEmitter as TypedEmitter } from '@livekit/typed-emitter';
 import {
   FfiHandle,
   livekitCopyBuffer,
diff --git a/packages/livekit-rtc/src/room.ts b/packages/livekit-rtc/src/room.ts
index 2c50981e..b12e8f9c 100644
--- a/packages/livekit-rtc/src/room.ts
+++ b/packages/livekit-rtc/src/room.ts
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import EventEmitter from 'events';
-import type TypedEmitter from 'typed-emitter';
+import type { TypedEventEmitter as TypedEmitter } from '@livekit/typed-emitter';
 import type { E2EEOptions } from './e2ee.js';
 import { E2EEManager } from './e2ee.js';
 import { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';
diff --git a/packages/livekit-rtc/src/video_stream.ts b/packages/livekit-rtc/src/video_stream.ts
index d6a9ed45..182df9aa 100644
--- a/packages/livekit-rtc/src/video_stream.ts
+++ b/packages/livekit-rtc/src/video_stream.ts
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import EventEmitter from 'events';
-import type TypedEmitter from 'typed-emitter';
+import type { TypedEventEmitter as TypedEmitter } from '@livekit/typed-emitter';
 import type { FfiEvent } from './ffi_client.js';
 import { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';
 import type {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 04faab37..924b5393 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -149,9 +149,9 @@ importers:
       '@bufbuild/protobuf':
         specifier: ^1.4.2
         version: 1.10.0
-      typed-emitter:
-        specifier: ^2.1.0
-        version: 2.1.0
+      '@livekit/typed-emitter':
+        specifier: ^3.0.0
+        version: 3.0.0
     optionalDependencies:
       '@livekit/rtc-node-darwin-arm64':
         specifier: workspace:*
@@ -722,6 +722,9 @@ packages:
   '@livekit/protocol@1.20.0':
     resolution: {integrity: sha512-2RJQwzBa+MfUoy0zBWuyj8S2MTBxeTgREeG0r/1bNmkAFiBhsdgr87gIvblyqJxffUxJpALMu1Ee0M1XHX+9Ug==}
 
+  '@livekit/typed-emitter@3.0.0':
+    resolution: {integrity: sha512-9bl0k4MgBPZu3Qu3R3xy12rmbW17e3bE9yf4YY85gJIQ3ezLEj/uzpKHWBsLaDoL5Mozz8QCgggwIBudYQWeQg==}
+
   '@manypkg/find-root@1.1.0':
     resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==}
 
@@ -2525,9 +2528,6 @@ packages:
   run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
-  rxjs@7.8.1:
-    resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
-
   safe-array-concat@1.1.2:
     resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
     engines: {node: '>=0.4'}
@@ -2838,9 +2838,6 @@ packages:
     resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
     engines: {node: '>= 0.4'}
 
-  typed-emitter@2.1.0:
-    resolution: {integrity: sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==}
-
   typedoc@0.26.6:
     resolution: {integrity: sha512-SfEU3SH3wHNaxhFPjaZE2kNl/NFtLNW5c1oHsg7mti7GjmUj1Roq6osBQeMd+F4kL0BoRBBr8gQAuqBlfFu8LA==}
     engines: {node: '>= 18'}
@@ -3496,6 +3493,8 @@ snapshots:
     dependencies:
       '@bufbuild/protobuf': 1.10.0
 
+  '@livekit/typed-emitter@3.0.0': {}
+
   '@manypkg/find-root@1.1.0':
     dependencies:
       '@babel/runtime': 7.24.7
@@ -5568,11 +5567,6 @@ snapshots:
     dependencies:
       queue-microtask: 1.2.3
 
-  rxjs@7.8.1:
-    dependencies:
-      tslib: 2.7.0
-    optional: true
-
   safe-array-concat@1.1.2:
     dependencies:
       call-bind: 1.0.7
@@ -5880,10 +5874,6 @@ snapshots:
       is-typed-array: 1.1.13
       possible-typed-array-names: 1.0.0
 
-  typed-emitter@2.1.0:
-    optionalDependencies:
-      rxjs: 7.8.1
-
   typedoc@0.26.6(typescript@5.5.4):
     dependencies:
       lunr: 2.3.9