diff --git a/app/assets/javascripts/discourse/dialects/code_dialect.js b/app/assets/javascripts/discourse/dialects/code_dialect.js
index 275b138fe65..8ef0545296b 100644
--- a/app/assets/javascripts/discourse/dialects/code_dialect.js
+++ b/app/assets/javascripts/discourse/dialects/code_dialect.js
@@ -10,6 +10,8 @@ var acceptableCodeClasses =
    "profile", "python", "r", "rib", "rsl", "ruby", "rust", "scala", "smalltalk", "sql", "tex", "text",
    "vala", "vbscript", "vhdl"];
 
+var textCodeClasses = ["text", "pre"];
+
 function flattenBlocks(blocks) {
   var result = "";
   blocks.forEach(function(b) {
@@ -28,7 +30,12 @@ Discourse.Dialect.replaceBlock({
     if (matches[1] && acceptableCodeClasses.indexOf(matches[1]) !== -1) {
       klass = matches[1];
     }
-    return ['p', ['pre', ['code', {'class': klass}, flattenBlocks(blockContents) ]]];
+
+    if (textCodeClasses.indexOf(matches[1]) !== -1) {
+      return ['p', ['pre', ['code', flattenBlocks(blockContents) ]]];
+    } else  {
+      return ['p', ['pre', ['code', {'class': klass}, flattenBlocks(blockContents) ]]];
+    }
   }
 });