diff --git a/CTFd/static/original/js/chalboard.js b/CTFd/static/original/js/chalboard.js
index aa1bd31d..156e3aec 100644
--- a/CTFd/static/original/js/chalboard.js
+++ b/CTFd/static/original/js/chalboard.js
@@ -39,7 +39,7 @@ function updateChalWindow(obj) {
             name: obj.name,
             value: obj.value,
             tags: obj.tags,
-            desc: marked(obj.description, {'gfm':true, 'breaks':true}),
+            desc: obj.description,
             solves: solves,
             files: obj.files,
             hints: obj.hints
diff --git a/CTFd/static/original/js/templates/challenges/standard/standard-challenge-script.js b/CTFd/static/original/js/templates/challenges/standard/standard-challenge-script.js
index 409e1552..8ee657ab 100644
--- a/CTFd/static/original/js/templates/challenges/standard/standard-challenge-script.js
+++ b/CTFd/static/original/js/templates/challenges/standard/standard-challenge-script.js
@@ -22,4 +22,6 @@ $(".input-field").bind({
             $label.removeClass('input--hide' );
         }
     }
-});
\ No newline at end of file
+});
+
+$('.chal-desc').html(marked($('.chal-desc').html(), {'gfm':true, 'breaks':true}));