diff --git a/packages/rocketchat-markdown/markdowncode.js b/packages/rocketchat-markdown/markdowncode.js
index 65f00ce79ff1..e00b030d01bc 100644
--- a/packages/rocketchat-markdown/markdowncode.js
+++ b/packages/rocketchat-markdown/markdowncode.js
@@ -60,29 +60,16 @@ class MarkdownCode {
 
 				if (codeMatch != null) {
 					// Process highlight if this part is code
-					let code;
-					let lang;
-					let result;
 					const singleLine = codeMatch[0].indexOf('\n') === -1;
-
-					if (singleLine) {
-						lang = '';
-						code = _.unescapeHTML(codeMatch[1] + codeMatch[2]);
-					} else {
-						lang = codeMatch[1];
-						code = _.unescapeHTML(codeMatch[2]);
-					}
-
-					if (s.trim(lang) === '') {
-						lang = '';
-					}
-
-					if (!Array.from(hljs.listLanguages()).includes(s.trim(lang))) {
-						result = hljs.highlightAuto((lang + code));
-					} else {
-						result = hljs.highlight(s.trim(lang), code);
-					}
-
+					const lang = !singleLine && Array.from(hljs.listLanguages()).includes(s.trim(codeMatch[1])) ? s.trim(codeMatch[1]) : '';
+					const code =
+						singleLine ?
+							_.unescapeHTML(codeMatch[1]) :
+							lang === '' ?
+								_.unescapeHTML(codeMatch[1] + codeMatch[2]) :
+								_.unescapeHTML(codeMatch[2]);
+
+					const result = lang === '' ? hljs.highlightAuto((lang + code)) : hljs.highlight(lang, code);
 					const token = `=!=${ Random.id() }=!=`;
 
 					message.tokens.push({
diff --git a/packages/rocketchat-mentions/Mentions.js b/packages/rocketchat-mentions/Mentions.js
index 55959a9bed54..c9a744a9ac40 100644
--- a/packages/rocketchat-mentions/Mentions.js
+++ b/packages/rocketchat-mentions/Mentions.js
@@ -50,7 +50,8 @@ export default class {
 		});
 	}
 	replaceChannels(str, message) {
-		return str.replace(this.channelMentionRegex, (match, name) => {
+		//since apostrophe escaped contains # we need to unescape it
+		return str.replace(/'/g, '\'').replace(this.channelMentionRegex, (match, name) => {
 			if (message.temp == null && _.findWhere(message.channels, {name}) == null) {
 				return match;
 			}