diff --git a/app/serializers/concerns/topic_tags_mixin.rb b/app/serializers/concerns/topic_tags_mixin.rb
index 2fdbc3deb6c..6ad88b47ea2 100644
--- a/app/serializers/concerns/topic_tags_mixin.rb
+++ b/app/serializers/concerns/topic_tags_mixin.rb
@@ -8,7 +8,8 @@ module TopicTagsMixin
   end
 
   def tags
-    topic.tags.pluck(:name)
+    # Calling method `pluck` along with `includes` causing N+1 queries
+    topic.tags.map(&:name)
   end
 
   def topic