diff --git a/src/web/app/common/scripts/text-compiler.js b/src/web/app/common/scripts/text-compiler.js
index 3098d2ff8..aacd28fb6 100644
--- a/src/web/app/common/scripts/text-compiler.js
+++ b/src/web/app/common/scripts/text-compiler.js
@@ -37,7 +37,9 @@ module.exports = (tokens, shouldBreak) => {
 		}
 	}).join('');
 
-	text = text.replace(/<br><code><pre>/g, '<code><pre>').replace(/<\/code><\/pre><br>/g, '</code></pre>');
+	text = text
+		.replace(/ <code>/g, '<code>').replace(/<\/code> /g, '</code>')
+		.replace(/<br><code><pre>/g, '<code><pre>').replace(/<\/code><\/pre><br>/g, '</code></pre>');
 
 	if (me && me.data && me.data.nya) {
 		text = nyaize(text);