diff --git a/extensions/tags/js/src/common/helpers/tagLabel.js b/extensions/tags/js/src/common/helpers/tagLabel.js
index f52be00df..e56262b8b 100644
--- a/extensions/tags/js/src/common/helpers/tagLabel.js
+++ b/extensions/tags/js/src/common/helpers/tagLabel.js
@@ -6,7 +6,7 @@ export default function tagLabel(tag, attrs = {}) {
   attrs.className = 'TagLabel ' + (attrs.className || '');
 
   const link = extract(attrs, 'link');
-  let tagText = tag ? tag.name() : app.translator.trans('flarum-tags.lib.deleted_tag_text');
+  const tagText = tag ? tag.name() : app.translator.trans('flarum-tags.lib.deleted_tag_text');
 
   if (tag) {
     const color = tag.color();
@@ -23,10 +23,11 @@ export default function tagLabel(tag, attrs = {}) {
   } else {
     attrs.className += ' untagged';
   }
+
   return (
     m((link ? 'a' : 'span'), attrs,
       <span className="TagLabel-text">
-        {tag.icon() && tagIcon(tag, {}, {useColor: false})} {tagText}
+        {tag && tag.icon() && tagIcon(tag, {}, {useColor: false})} {tagText}
       </span>
     )
   );