diff --git a/packages/rocketchat-markdown/markdowncode.js b/packages/rocketchat-markdown/markdowncode.js
index 1ff5ca80f787..08fd0990c839 100644
--- a/packages/rocketchat-markdown/markdowncode.js
+++ b/packages/rocketchat-markdown/markdowncode.js
@@ -51,7 +51,7 @@ class MarkdownCode {
 			}
 
 			// Separate text in code blocks and non code blocks
-			const msgParts = message.html.split(/(^.*)(```(?:[a-zA-Z]+)?(?:(?:.|\n)*?)```)(.*\n?)$/gm);
+			const msgParts = message.html.split(/^\s*(```(?:[a-zA-Z]+)?(?:(?:.|\n)*?)```)(?:\n)?$/gm);
 
 			for (let index = 0; index < msgParts.length; index++) {
 				// Verify if this part is code