diff --git a/src/codec.ts b/src/codec.ts
index 0406be6..fe6a28f 100644
--- a/src/codec.ts
+++ b/src/codec.ts
@@ -43,6 +43,7 @@ export class NoiseHandshakeEncoder implements Encoder {
   async toProtoObj(message: Partial<Message>): Promise<ProtoMessage | undefined> {
     const timestamp = message.timestamp ?? new Date();
     return {
+      rateLimitProof: undefined,
       payload: this.hsStepResult.payload2.serialize(),
       version: version,
       contentTopic: this.contentTopic,
@@ -64,7 +65,9 @@ export class NoiseHandshakeDecoder implements Decoder<NoiseHandshakeMessage> {
   fromWireToProtoObj(bytes: Uint8Array): Promise<ProtoMessage | undefined> {
     const protoMessage = proto_message.WakuMessage.decode(bytes);
     log("Message decoded", protoMessage);
-    return Promise.resolve(protoMessage);
+    // TODO(@weboko): remove type casting when released
+    // https://github.com/waku-org/js-waku/pull/1136
+    return Promise.resolve(protoMessage as ProtoMessage);
   }
 
   async fromProtoObj(proto: ProtoMessage): Promise<NoiseHandshakeMessage | undefined> {
@@ -136,6 +139,7 @@ export class NoiseSecureTransferEncoder implements Encoder {
 
     return {
       payload,
+      rateLimitProof: undefined,
       version: version,
       contentTopic: this.contentTopic,
       timestamp: BigInt(timestamp.valueOf()) * OneMillion,
@@ -159,7 +163,9 @@ export class NoiseSecureTransferDecoder implements Decoder<NoiseSecureMessage> {
   fromWireToProtoObj(bytes: Uint8Array): Promise<ProtoMessage | undefined> {
     const protoMessage = proto_message.WakuMessage.decode(bytes);
     log("Message decoded", protoMessage);
-    return Promise.resolve(protoMessage);
+    // TODO(@weboko): remove type casting when released
+    // https://github.com/waku-org/js-waku/pull/1136
+    return Promise.resolve(protoMessage as ProtoMessage);
   }
 
   async fromProtoObj(proto: ProtoMessage): Promise<NoiseSecureMessage | undefined> {
diff --git a/src/pairing.ts b/src/pairing.ts
index 50ff9ab..5b3995f 100644
--- a/src/pairing.ts
+++ b/src/pairing.ts
@@ -258,7 +258,12 @@ export class WakuPairing {
     // We prepare a message from initiator's payload2
     // At this point wakuMsg is sent over the Waku network to responder content topic
     let encoder = new NoiseHandshakeEncoder(this.contentTopic, hsStep);
-    await this.sender.publish(encoder, {});
+    await this.sender.publish(encoder, {
+      payload: undefined,
+      contentTopic: undefined,
+      timestamp: undefined,
+      rateLimitProof: undefined,
+    });
 
     // We generate an authorization code using the handshake state
     // this check has to be confirmed with a user interaction, comparing auth codes in both ends
@@ -294,7 +299,12 @@ export class WakuPairing {
     });
 
     encoder = new NoiseHandshakeEncoder(this.contentTopic, hsStep);
-    await this.sender.publish(encoder, {});
+    await this.sender.publish(encoder, {
+      payload: undefined,
+      contentTopic: undefined,
+      timestamp: undefined,
+      rateLimitProof: undefined,
+    });
 
     // Secure Transfer Phase
     this.handshakeResult = this.handshake.finalizeHandshake();
@@ -333,7 +343,12 @@ export class WakuPairing {
 
     // We prepare a Waku message from responder's payload2
     const encoder = new NoiseHandshakeEncoder(this.contentTopic, hsStep);
-    await this.sender.publish(encoder, {});
+    await this.sender.publish(encoder, {
+      payload: undefined,
+      contentTopic: undefined,
+      timestamp: undefined,
+      rateLimitProof: undefined,
+    });
 
     // 3rd step
     // -> sA, sAeB, sAsB  {s}