diff --git a/app/lib/methods/sendMessage.js b/app/lib/methods/sendMessage.js
index 2b9405f16..a358f5ba0 100644
--- a/app/lib/methods/sendMessage.js
+++ b/app/lib/methods/sendMessage.js
@@ -14,8 +14,10 @@ const changeMessageStatus = async(id, tmid, status, message) => {
 	successBatch.push(
 		messageRecord.prepareUpdate((m) => {
 			m.status = status;
-			m.mentions = message.mentions;
-			m.channels = message.channels;
+			if (message) {
+				m.mentions = message.mentions;
+				m.channels = message.channels;
+			}
 		})
 	);
 
@@ -24,8 +26,10 @@ const changeMessageStatus = async(id, tmid, status, message) => {
 		successBatch.push(
 			threadMessageRecord.prepareUpdate((tm) => {
 				tm.status = status;
-				tm.mentions = message.mentions;
-				tm.channels = message.channels;
+				if (message) {
+					tm.mentions = message.mentions;
+					tm.channels = message.channels;
+				}
 			})
 		);
 	}
@@ -51,10 +55,13 @@ export async function sendMessageCall(message) {
 				_id, rid, msg, tmid
 			}
 		});
-		await changeMessageStatus(_id, tmid, messagesStatus.SENT, result.message);
-	} catch (e) {
-		await changeMessageStatus(_id, tmid, messagesStatus.ERROR);
+		if (result.success) {
+			return changeMessageStatus(_id, tmid, messagesStatus.SENT, result.message);
+		}
+	} catch {
+		// do nothing
 	}
+	return changeMessageStatus(_id, tmid, messagesStatus.ERROR);
 }
 
 export default async function(rid, msg, tmid, user) {
diff --git a/yarn.lock b/yarn.lock
index cae8d0e4e..fd8a4f878 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3331,7 +3331,7 @@ commondir@^1.0.1:
 
 "commonmark@git+https://github.com/RocketChat/commonmark.js.git":
   version "0.29.0"
-  resolved "git+https://github.com/RocketChat/commonmark.js.git#fe037b1c97ca5bc7d329ef312bf9a374ab8f3d4a"
+  resolved "git+https://github.com/RocketChat/commonmark.js.git#5d293fe9ba83a3e6f842d5d3f41a9b57c35bea1f"
   dependencies:
     entities "~ 1.1.1"
     mdurl "~ 1.0.1"