diff --git a/examples/cli-chat/src/chat.ts b/examples/cli-chat/src/chat.ts
index d0c3f0f7be..b61787f3ed 100644
--- a/examples/cli-chat/src/chat.ts
+++ b/examples/cli-chat/src/chat.ts
@@ -104,10 +104,13 @@ export default async function startChat(): Promise<void> {
     rl.prompt();
     const chatMessage = ChatMessage.fromUtf8String(new Date(), nick, line);
 
-    const msg = await WakuMessage.fromBytes(chatMessage.encode(), {
-      contentTopic: ChatContentTopic,
-      timestamp: new Date(),
-    });
+    const msg = await WakuMessage.fromBytes(
+      chatMessage.encode(),
+      ChatContentTopic,
+      {
+        timestamp: new Date(),
+      }
+    );
     if (opts.lightPush) {
       await waku.lightPush.push(msg);
     } else {
diff --git a/examples/eth-dm/src/BroadcastPublicKey.tsx b/examples/eth-dm/src/BroadcastPublicKey.tsx
index c0f010d826..c302538f98 100644
--- a/examples/eth-dm/src/BroadcastPublicKey.tsx
+++ b/examples/eth-dm/src/BroadcastPublicKey.tsx
@@ -31,7 +31,7 @@ export default function BroadcastPublicKey({
             console.error('Failed to send Public Key Message', e);
           });
         })
-        .catch((e) => {
+        .catch(() => {
           console.log('Failed to encode Public Key Message in Waku Message');
         });
     } else {
@@ -47,7 +47,7 @@ export default function BroadcastPublicKey({
                   console.error('Failed to send Public Key Message', e);
                 });
             })
-            .catch((e) => {
+            .catch(() => {
               console.log(
                 'Failed to encode Public Key Message in Waku Message'
               );
@@ -75,7 +75,5 @@ async function encodePublicKeyWakuMessage(
   publicKeyMessage: PublicKeyMessage
 ): Promise<WakuMessage> {
   const payload = publicKeyMessage.encode();
-  return await WakuMessage.fromBytes(payload, {
-    contentTopic: PublicKeyContentTopic,
-  });
+  return await WakuMessage.fromBytes(payload, PublicKeyContentTopic);
 }
diff --git a/examples/eth-dm/src/messaging/SendMessage.tsx b/examples/eth-dm/src/messaging/SendMessage.tsx
index e09931f815..464828479f 100644
--- a/examples/eth-dm/src/messaging/SendMessage.tsx
+++ b/examples/eth-dm/src/messaging/SendMessage.tsx
@@ -115,8 +115,7 @@ async function encodeEncryptedWakuMessage(
   });
 
   const payload = directMsg.encode();
-  return WakuMessage.fromBytes(payload, {
-    contentTopic: DirectMessageContentTopic,
+  return WakuMessage.fromBytes(payload, DirectMessageContentTopic, {
     encPublicKey: publicKey,
   });
 }
diff --git a/examples/web-chat/src/Room.tsx b/examples/web-chat/src/Room.tsx
index 70ade131df..9b217e8254 100644
--- a/examples/web-chat/src/Room.tsx
+++ b/examples/web-chat/src/Room.tsx
@@ -65,10 +65,11 @@ async function handleMessage(
   } else {
     const timestamp = new Date();
     const chatMessage = ChatMessage.fromUtf8String(timestamp, nick, message);
-    const wakuMsg = await WakuMessage.fromBytes(chatMessage.encode(), {
-      contentTopic: ChatContentTopic,
-      timestamp,
-    });
+    const wakuMsg = await WakuMessage.fromBytes(
+      chatMessage.encode(),
+      ChatContentTopic,
+      { timestamp }
+    );
     return messageSender(wakuMsg);
   }
 }