diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index a5762eea76..171d508e4c 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -3709,7 +3709,6 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
         checkIntegrityCreateItem (CDGroupRcv gInfo m) msgMeta `catchChatError` \_ -> pure ()
         cmdId <- createAckCmd conn
         let aChatMsgs = parseChatMessages msgBody
-        when (length aChatMsgs > 1) $ liftIO $ putStrLn (show msgBody)
         withAckMessage agentConnId cmdId msgMeta $ do
           forM_ aChatMsgs $ \case
             Right (ACMsg _ chatMsg) ->
diff --git a/src/Simplex/Chat/Protocol.hs b/src/Simplex/Chat/Protocol.hs
index 449901b2b8..863d45ce5a 100644
--- a/src/Simplex/Chat/Protocol.hs
+++ b/src/Simplex/Chat/Protocol.hs
@@ -490,12 +490,13 @@ maxChatMsgSize = 15610
 
 encodeChatMessage :: MsgEncodingI e => ChatMessage e -> Either String ByteString
 encodeChatMessage msg = do
-  let body = case chatToAppMessage msg of
-        AMJson m -> LB.toStrict $ J.encode m
-        AMBinary m -> strEncode m
-  if B.length body > maxChatMsgSize
-    then Left "large message"
-    else Right body
+  case chatToAppMessage msg of
+    AMJson m -> do
+      let body = LB.toStrict $ J.encode m
+      if B.length body > maxChatMsgSize
+        then Left "large message"
+        else Right body
+    AMBinary m -> Right $ strEncode m
 
 parseChatMessages :: ByteString -> [Either String AChatMessage]
 parseChatMessages "" = [Left "empty string"]