diff --git a/src/client.ts b/src/client.ts
index 8d89cd42b..4585d2963 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -930,8 +930,9 @@ export class StreamChat<StreamChatGenerics extends ExtendableGenerics = DefaultG
     set.add(factory);
 
     return () => {
+      // @ts-expect-error
       set.delete(factory);
-
+      // @ts-expect-error
       if (!set.size) {
         this.targetFactoriesByType.delete(eventType);
       }
diff --git a/src/thread.ts b/src/thread.ts
index c3181ab9f..1461d461c 100644
--- a/src/thread.ts
+++ b/src/thread.ts
@@ -63,9 +63,11 @@ export type ThreadReadState<SCG extends ExtendableGenerics = DefaultGenerics> =
 >;
 
 // TODO: figure out generics here
+// @ts-expect-error
 const messageNewFactory: TargetFactory<DefaultGenerics, 'message.new'> = (event) => {
   return event.parent_id ? `message.new-${event.parent_id}` : null;
 };
+// @ts-expect-error
 const threadMessageReadFactory: TargetFactory<DefaultGenerics, 'message.read'> = (event) => {
   return event.thread ? `message.read-${event.thread.parent_message_id}` : null;
 };