diff --git a/welco/kb/search_indexes.py b/welco/kb/search_indexes.py
index ec24f70..5cbafed 100644
--- a/welco/kb/search_indexes.py
+++ b/welco/kb/search_indexes.py
@@ -14,8 +14,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import html
+
 from django.utils.html import strip_tags
-from django.utils.six.moves.html_parser import HTMLParser
 
 from haystack import indexes
 
@@ -33,7 +34,7 @@ class PageIndex(indexes.SearchIndex, indexes.Indexable):
         return Page
 
     def prepare_text(self, obj):
-        return obj.title + ' ' + self.prepare_tags(obj) + ' ' + HTMLParser().unescape(strip_tags(obj.content))
+        return obj.title + ' ' + self.prepare_tags(obj) + ' ' + html.unescape(strip_tags(obj.content))
 
     def prepare_text_auto(self, obj):
         return self.prepare_text(obj)