diff --git a/packages/core/src/lib/filter/filter.ts b/packages/core/src/lib/filter/filter.ts
index f222dc2c8f..9306e8a09c 100644
--- a/packages/core/src/lib/filter/filter.ts
+++ b/packages/core/src/lib/filter/filter.ts
@@ -37,12 +37,11 @@ type IncomingMessageHandler = (
 
 export class FilterCore {
   private streamManager: StreamManager;
-  private static handleIncomingMessage?: IncomingMessageHandler;
 
   public readonly multicodec = FilterCodecs.SUBSCRIBE;
 
   public constructor(
-    handleIncomingMessage: IncomingMessageHandler,
+    private handleIncomingMessage: IncomingMessageHandler,
     public readonly pubsubTopics: PubsubTopic[],
     libp2p: Libp2p
   ) {
@@ -51,29 +50,6 @@ export class FilterCore {
       libp2p.components
     );
 
-    // TODO(weboko): remove when @waku/sdk 0.0.33 is released
-    const prevHandler = FilterCore.handleIncomingMessage;
-    FilterCore.handleIncomingMessage = !prevHandler
-      ? handleIncomingMessage
-      : async (pubsubTopic, message, peerIdStr): Promise<void> => {
-          try {
-            await prevHandler(pubsubTopic, message, peerIdStr);
-          } catch (e) {
-            log.error(
-              "Previous FilterCore incoming message handler failed ",
-              e
-            );
-          }
-
-          try {
-            await handleIncomingMessage(pubsubTopic, message, peerIdStr);
-          } catch (e) {
-            log.error("Present FilterCore incoming message handler failed ", e);
-          }
-
-          return;
-        };
-
     libp2p
       .handle(FilterCodecs.PUSH, this.onRequest.bind(this), {
         maxInboundStreams: 100
@@ -327,7 +303,7 @@ export class FilterCore {
             return;
           }
 
-          await FilterCore.handleIncomingMessage?.(
+          await this.handleIncomingMessage(
             pubsubTopic,
             wakuMessage,
             connection.remotePeer.toString()