diff --git a/app/assets/javascripts/discourse/lib/render-tags.js.es6 b/app/assets/javascripts/discourse/lib/render-tags.js.es6
index c8e1eeabfa7..1389502f77d 100644
--- a/app/assets/javascripts/discourse/lib/render-tags.js.es6
+++ b/app/assets/javascripts/discourse/lib/render-tags.js.es6
@@ -42,7 +42,7 @@ export default function(topic, params){
   if (customHtml || (tags && tags.length > 0)) {
     buffer = "<div class='discourse-tags'>";
     if (tags) {
-      for(var i=0; i<tags.length; i++){
+      for(let i=0; i<tags.length; i++){
         buffer += renderTag(tags[i]);
       }
     }
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs
index 159d836b48b..25795b30084 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs
@@ -32,13 +32,7 @@
         </div>
       {{/unless}}
 
-      {{#if topic.tags}}
-        <div class='discourse-tags'>
-        {{#each topic.visibleListTags as |tag|}}
-          {{discourse-tag tag}}
-        {{/each}}
-        </div>
-      {{/if}}
+      {{discourse-tags topic mode="list"}}
 
       {{raw-plugin-outlet name="topic-list-tags"}}