diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9cfced12..adf23ef2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Test: Upgrade nim-waku node to v0.4.
+- Waku Light Push upgraded to `2.0.0-beta1`.
+- Examples (web chat): Catch error if chat message decoding fails.
+- Examples (web chat): Do not send message if shift/alt/ctrl is pressed, enabling multiline messages.
+
 ## [0.6.0] - 2021-06-09
 
 ### Changed
diff --git a/examples/web-chat/src/Message.ts b/examples/web-chat/src/Message.ts
index cb49a1444..2ec9884ca 100644
--- a/examples/web-chat/src/Message.ts
+++ b/examples/web-chat/src/Message.ts
@@ -12,9 +12,17 @@ export class Message {
 
   static fromWakuMessage(wakuMsg: WakuMessage): Message | undefined {
     if (wakuMsg.payload) {
-      const chatMsg = ChatMessage.decode(wakuMsg.payload);
-      if (chatMsg) {
-        return new Message(chatMsg, wakuMsg.timestamp);
+      try {
+        const chatMsg = ChatMessage.decode(wakuMsg.payload);
+        if (chatMsg) {
+          return new Message(chatMsg, wakuMsg.timestamp);
+        }
+      } catch (e) {
+        console.error(
+          'Failed to decode chat message',
+          wakuMsg.payloadAsUtf8,
+          e
+        );
       }
     }
     return;
diff --git a/examples/web-chat/src/MessageInput.tsx b/examples/web-chat/src/MessageInput.tsx
index 3911bb873..9322779d1 100644
--- a/examples/web-chat/src/MessageInput.tsx
+++ b/examples/web-chat/src/MessageInput.tsx
@@ -29,7 +29,12 @@ export default function MessageInput(props: Props) {
   };
 
   const keyPressHandler = async (event: KeyboardEvent<HTMLInputElement>) => {
-    if (event.key === 'Enter') {
+    if (
+      event.key === 'Enter' &&
+      !event.altKey &&
+      !event.ctrlKey &&
+      !event.shiftKey
+    ) {
       await sendMessage();
     }
   };
diff --git a/nim-waku b/nim-waku
index 44cafcfee..5c58a19f4 160000
--- a/nim-waku
+++ b/nim-waku
@@ -1 +1 @@
-Subproject commit 44cafcfee339bed7ff7d014e9cb3111d0c46c733
+Subproject commit 5c58a19f4f50e207dcfbf34f4514cc7e88c709e5
diff --git a/src/lib/waku_light_push/index.ts b/src/lib/waku_light_push/index.ts
index c5a6c5804..da8679690 100644
--- a/src/lib/waku_light_push/index.ts
+++ b/src/lib/waku_light_push/index.ts
@@ -10,7 +10,7 @@ import { DefaultPubsubTopic } from '../waku_relay';
 
 import { PushRPC } from './push_rpc';
 
-export const LightPushCodec = '/vac/waku/lightpush/2.0.0-alpha1';
+export const LightPushCodec = '/vac/waku/lightpush/2.0.0-beta1';
 export { PushResponse };
 
 export interface CreateOptions {