diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js
index bdb4b29486..5e0c311f6b 100644
--- a/public/src/client/topic/events.js
+++ b/public/src/client/topic/events.js
@@ -160,9 +160,9 @@ define('forum/topic/events', [
 
 		if (data.topic.tags && data.topic.tagsupdated) {
 			Benchpress.render('partials/topic/tags', { tags: data.topic.tags }).then(function (html) {
-				const tags = $('.tags');
-
+				const tags = $('[data-pid="' + data.post.pid + '"] .tags');
 				tags.fadeOut(250, function () {
+					tags.toggleClass('hidden', data.topic.tags.length === 0);
 					tags.html(html).fadeIn(250);
 				});
 			});