diff --git a/packages/status-js/src/client.ts b/packages/status-js/src/client.ts
index 4f25c1a..aee6ae6 100644
--- a/packages/status-js/src/client.ts
+++ b/packages/status-js/src/client.ts
@@ -42,6 +42,7 @@ class Client {
           // '/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ',
         ],
       },
+      libp2p: { config: { pubsub: { enabled: true, emitSelf: true } } },
     })
     await waku.waitForRemotePeer()
 
diff --git a/packages/status-react/src/routes/chat/components/chat-message/index.tsx b/packages/status-react/src/routes/chat/components/chat-message/index.tsx
index 3b451a4..c084a13 100644
--- a/packages/status-react/src/routes/chat/components/chat-message/index.tsx
+++ b/packages/status-react/src/routes/chat/components/chat-message/index.tsx
@@ -77,14 +77,14 @@ export const ChatMessage = (props: Props) => {
   const userProfileDialog = useDialog(UserProfileDialog)
 
   const handleMessageSubmit = (message: string) => {
-    client.community.get(chatId).sendTextMessage(
+    client.community.chats.get(chatId).sendTextMessage(
       message,
       '0x0fa999097568d1fdcc39108a08d75340bd2cee5ec59c36799007150d0a9fc896'
     )
   }
 
   const handleReaction = (reaction: Reaction) => {
-    client.community.get(chatId).sendReaction(chatId, messageId, reaction)
+    client.community.chats.get(chatId).sendReaction(chatId, messageId, reaction)
   }
 
   const handleReplyClick = () => {
diff --git a/packages/status-react/src/routes/chat/index.tsx b/packages/status-react/src/routes/chat/index.tsx
index 0aae6be..d402a25 100644
--- a/packages/status-react/src/routes/chat/index.tsx
+++ b/packages/status-react/src/routes/chat/index.tsx
@@ -82,7 +82,7 @@ export const Chat = () => {
   const showMembers = enableMembers && state.showMembers
 
   const handleMessageSubmit = (message: string) => {
-    client.community.get(chatId).sendTextMessage(
+    client.community.chats.get(chatId).sendTextMessage(
       message
       // '0x0fa999097568d1fdcc39108a08d75340bd2cee5ec59c36799007150d0a9fc896'
     )