diff --git a/app/assets/javascripts/discourse/templates/tags/index.hbs b/app/assets/javascripts/discourse/templates/tags/index.hbs
index 1036b77bc77..1cbccceaaba 100644
--- a/app/assets/javascripts/discourse/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/index.hbs
@@ -27,4 +27,6 @@
   {{tag-list tags=tagGroup.tags sortProperties=sortProperties tagGroupName=tagGroup.name}}
 {{/each}}
 
-{{tag-list tags=model sortProperties=sortProperties titleKey=otherTagsTitleKey}}
+{{#if model}}
+  {{tag-list tags=model sortProperties=sortProperties titleKey=otherTagsTitleKey}}
+{{/if}}