diff --git a/renderer.php b/renderer.php
index db03ba75a0e..3ab12aae32c 100644
--- a/renderer.php
+++ b/renderer.php
@@ -97,20 +97,31 @@ public function formulation_and_controls(question_attempt $qa, question_display_
         );
         // Restore inputnames.
         foreach ($question->inputs as $name => $input) {
+            // ISS1752 - The Mathjax filter is mangling the nolink spans if they're between
+            // curly braces so we have to do an extra search.
             $questiontext = str_replace(
-                "<span class=\"nolink\">[[InMNEYMWDx:{$name}]]</span>",
+                [
+                    "<span class=\"nolink\">[[InMNEYMWDx:{$name}]]</span>",
+                    "&lt;span class=\"nolink\"&gt;[[InMNEYMWDx:{$name}]]&lt;/span&gt;"
+                ],
                 "[[input:{$name}]]",
                 $questiontext
             );
             $questiontext = str_replace(
-                "<span class=\"nolink\">[[VnMNEYMWDx:{$name}]]</span>",
+                [
+                    "<span class=\"nolink\">[[VnMNEYMWDx:{$name}]]</span>",
+                    "&lt;span class=\"nolink\"&gt;[[VnMNEYMWDx:{$name}]]&lt;/span&gt;"
+                ],
                 "[[validation:{$name}]]",
                 $questiontext
             );
         }
         foreach ($question->prts as $index => $prt) {
             $questiontext = str_replace(
-                "<span class=\"nolink\">[[GDBBdLBJLg:{$index}]]</span>",
+                [
+                    "<span class=\"nolink\">[[GDBBdLBJLg:{$index}]]</span>",
+                    "&lt;span class=\"nolink\"&gt;[[GDBBdLBJLg:{$index}]]&lt;/span&gt;"
+                ],
                 "[[feedback:{$index}]]",
                 $questiontext
             );