diff --git a/lib/weblib.php b/lib/weblib.php
index 8c6646b1a20..9efbd489318 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1097,6 +1097,10 @@ function filter_text($text, $courseid=NULL) {
         }
     }
 
+    /// <nolink> tags removed for XHTML compatibility
+    $text = str_replace('<nolink>', '', $text);
+    $text = str_replace('</nolink>', '', $text);
+
     return $text;
 }
 
diff --git a/mod/glossary/filter.php b/mod/glossary/filter.php
index c583876b4c6..59808fa0726 100644
--- a/mod/glossary/filter.php
+++ b/mod/glossary/filter.php
@@ -108,9 +108,6 @@
                 }
             }
         }
-        /// <nolink> tags removed for XHTML compatibility
-        $text = str_replace('<nolink>', '', $text);
-        $text = str_replace('</nolink>', '', $text);
 
         return $text;
     }