diff --git a/common/src/ffmpeg-rebroadcast.ts b/common/src/ffmpeg-rebroadcast.ts
index 00492d7670..b2022cf15b 100644
--- a/common/src/ffmpeg-rebroadcast.ts
+++ b/common/src/ffmpeg-rebroadcast.ts
@@ -361,8 +361,7 @@ export interface RebroadcasterOptions {
     },
 }
 
-export async function handleRebroadcasterClient(duplex: Promise<Duplex> | Duplex, options?: RebroadcasterOptions) {
-    const socket = await duplex;
+export function handleRebroadcasterClient(socket: Duplex, options?: RebroadcasterOptions) {
     const firstWriteData = (data: StreamChunk) => {
         if (data.startStream) {
             socket.write(data.startStream)
diff --git a/common/src/listen-cluster.ts b/common/src/listen-cluster.ts
index 99a3ca3605..1e993c643f 100644
--- a/common/src/listen-cluster.ts
+++ b/common/src/listen-cluster.ts
@@ -62,4 +62,4 @@ export async function bind(server: dgram.Socket, port: number) {
     }
 }
 
-export { listenZero, listenZeroSingleClient } from "@scrypted/server/src/listen-zero";
+export { listenZero, listenZeroSingleClient, ListenZeroSingleClientTimeoutError } from "@scrypted/server/src/listen-zero";