diff --git a/web-chat/package.json b/web-chat/package.json
index 7e5808a..c96c1a8 100644
--- a/web-chat/package.json
+++ b/web-chat/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "@livechat/ui-kit": "^0.5.0-20",
     "@multiformats/multiaddr": "^10.4.0",
-    "js-waku": "0.29.0",
+    "js-waku": "0.30.0",
     "process": "^0.11.10",
     "protons-runtime": "^3.1.0",
     "react": "^17.0.2",
diff --git a/web-chat/pnpm-lock.yaml b/web-chat/pnpm-lock.yaml
index 2542e48..bdc7d13 100644
--- a/web-chat/pnpm-lock.yaml
+++ b/web-chat/pnpm-lock.yaml
@@ -9,7 +9,7 @@ specifiers:
   '@types/react-dom': ^17.0.11
   cspell: ^6.0.0
   gh-pages: ^4.0.0
-  js-waku: 0.29.0
+  js-waku: 0.30.0
   npm-run-all: ^4.1.5
   prettier: ^2.6.2
   process: ^0.11.10
@@ -26,7 +26,7 @@ specifiers:
 dependencies:
   '@livechat/ui-kit': 0.5.0-20_ibvs32p3vr2bbtbo3dwziny444
   '@multiformats/multiaddr': 10.4.0
-  js-waku: 0.29.0
+  js-waku: 0.30.0
   process: 0.11.10
   protons-runtime: 3.1.0_uint8arraylist@2.3.2
   react: 17.0.2
@@ -8382,8 +8382,8 @@ packages:
   /js-tokens/4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  /js-waku/0.29.0:
-    resolution: {integrity: sha512-44GOpNbkFt/1/bDZ3tcaeemehaZaxw404QmTvHw7FUwY6dtvGsDEERLEw1TERUljDESFjvEOcJjYnLcNDY1MHg==}
+  /js-waku/0.30.0:
+    resolution: {integrity: sha512-CcPsPXbuIIoaMwRU/jw+U4pVCqRPbt4h/tjpk4skXnlTLTSGDOkfpvQ45Aj5tS0yXgwKdAjOMziV14OwfeZw/w==}
     engines: {node: '>=16'}
     dependencies:
       '@chainsafe/libp2p-gossipsub': 4.1.1
diff --git a/web-chat/src/App.tsx b/web-chat/src/App.tsx
index 5093a46..e495634 100644
--- a/web-chat/src/App.tsx
+++ b/web-chat/src/App.tsx
@@ -219,8 +219,7 @@ async function initWaku(setter: (waku: WakuLight) => void) {
 
 function selectFleetEnv() {
   // Works with react-scripts
-  // TODO: Re-enable the switch once nwaku v0.12 is deployed
-  if (true || process?.env?.NODE_ENV === "development") {
+  if (process?.env?.NODE_ENV === "development") {
     return Fleet.Test;
   } else {
     return Fleet.Prod;
diff --git a/web-chat/src/Room.tsx b/web-chat/src/Room.tsx
index 30dccd7..f95323a 100644
--- a/web-chat/src/Room.tsx
+++ b/web-chat/src/Room.tsx
@@ -76,7 +76,7 @@ async function handleMessage(
   message: string,
   nick: string,
   commandHandler: (cmd: string) => void,
-  sender: (wakuMsg: WakuMessage) => Promise<void>
+  sender: (wakuMsg: Partial<WakuMessage>) => Promise<void>
 ) {
   if (message.startsWith("/")) {
     commandHandler(message);