diff --git a/templates/partials/topic/event.tpl b/templates/partials/topic/event.tpl
deleted file mode 100644
index 4086e6f..0000000
--- a/templates/partials/topic/event.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<li component="topic/event" class="timeline-event" data-topic-event-id="{./id}" data-topic-event-type="{./type}">
-	<div class="timeline-badge">
-		<i class="fa {{{ if ./icon }}}{./icon}{{{ else }}}fa-circle{{{ end }}}"></i>
-	</div>
-	<span class="timeline-text">
-		{{{ if ./href}}}
-		<a href="{config.relative_path}{./href}">{./text}</a>
-		{{{ else }}}
-		{./text}
-		{{{ end }}}
-		&nbsp;
-	</span>
-	{{{ if ./user }}}
-		{{{ if ./user.system }}}
-		<span class="timeline-text">[[global:system-user]]</span>&nbsp;
-		{{{ else }}}
-		<span><a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "xs", true)} &nbsp; {./user.username}</a></span>&nbsp;
-		{{{ end }}}
-	{{{ end }}}
-	<span class="timeago timeline-text" title="{./timestampISO}"></span>
-
-	{{{ if privileges.isAdminOrMod }}}
-		&nbsp;<span component="topic/event/delete" data-topic-event-id="{./id}" data-topic-event-type="{./type}" class="timeline-text pointer" title="[[topic:delete-event]]"><i class="fa fa-trash"></i></span>
-	{{{ end }}}
-</li>
-
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 5a79157..a42dfa3 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -71,11 +71,7 @@
 
 					<!-- IMPORT partials/topic/post.tpl -->
 				</li>
-				{{{ if (config.topicPostSort != "most_votes") }}}
-				{{{ each ./events}}}
-				<!-- IMPORT partials/topic/event.tpl -->
-				{{{ end }}}
-				{{{ end }}}
+				{renderTopicEvents(@index, config.topicPostSort)}
 			{{{end}}}
 		</ul>