diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index cd670f2..d6a13d2 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -2,7 +2,7 @@
 	<meta itemprop="itemListOrder" content="descending">
 	<!-- BEGIN topics -->
 	<li component="category/topic" class="row clearfix {function.generateTopicClass}" <!-- IMPORT partials/data/category.tpl -->>
-		<meta itemprop="name" content="{function.stripTags, titleEscaped}">
+		<meta itemprop="name" content="{function.stripTags, title}">
 
 		<div class="col-md-7 col-sm-9 col-xs-10 content">
 			<div class="avatar pull-left">
@@ -30,9 +30,9 @@
 				<i component="topic/pinned" class="fa fa-thumb-tack <!-- IF !topics.pinned -->hide<!-- ENDIF !topics.pinned -->"></i>
 				<i component="topic/locked" class="fa fa-lock <!-- IF !topics.locked -->hide<!-- ENDIF !topics.locked -->"></i>
 				<!-- IF !topics.noAnchor -->
-				<a href="{config.relative_path}/topic/{topics.slug}" itemprop="url">{topics.titleEscaped}</a><br />
+				<a href="{config.relative_path}/topic/{topics.slug}" itemprop="url">{topics.title}</a><br />
 				<!-- ELSE -->
-				{topics.titleEscaped}<br />
+				{topics.title}<br />
 				<!-- ENDIF !topics.noAnchor -->
 
 				<!-- IF !template.category -->
diff --git a/templates/topic.tpl b/templates/topic.tpl
index abeb8ea..733a10e 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -4,7 +4,7 @@
 
 	<h1 component="post/header" class="hidden-xs" itemprop="name">
 
-		<i class="pull-left fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->"></i> <i class="pull-left fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->"></i> <span class="topic-title" component="topic/title">{titleEscaped}</span>
+		<i class="pull-left fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->"></i> <i class="pull-left fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->"></i> <span class="topic-title" component="topic/title">{title}</span>
 
 		<span class="browsing-users hidden hidden-xs hidden-sm pull-right">
 			<span>[[category:browsing]]</span>