diff --git a/apps/web/lib/video-download-permissions.ts b/apps/web/lib/video-download-permissions.ts
index d7d3e10ab7a..c7faee876ea 100644
--- a/apps/web/lib/video-download-permissions.ts
+++ b/apps/web/lib/video-download-permissions.ts
@@ -43,7 +43,6 @@ export async function canUserDownloadVideo({
 				),
 			)
 			.limit(1);
-
 		if (orgMembership) return true;
 	}
 
diff --git a/packages/sdk-recorder/src/index.ts b/packages/sdk-recorder/src/index.ts
index 0f7eb10e1fb..991d95e8d05 100644
--- a/packages/sdk-recorder/src/index.ts
+++ b/packages/sdk-recorder/src/index.ts
@@ -82,9 +82,11 @@ export class CapRecorder {
 			this.listeners.set(event, new Set());
 		}
 		const set = this.listeners.get(event);
-		if (set) set.add(handler as EventHandler<keyof RecorderEventMap>);
+		if (!set) return () => {};
+		const typedHandler = handler as unknown as EventHandler<keyof RecorderEventMap>;
+		set.add(typedHandler);
 		return () => {
-			this.listeners.get(event)?.delete(handler);
+			set.delete(typedHandler);
 		};
 	}