diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8e536572..512fab38f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ v2.6.3 (FUTURE)
 ## Bug Fixes
 
 * [#3420](https://github.com/netbox-community/netbox/issues/3420) - Serial number filter for racks, devices, and inventory items is now case-insensitive
+* [#3424](https://github.com/netbox-community/netbox/issues/3424) - Fix tag coloring for non-linked tags
 
 ## Enhancements
 
diff --git a/netbox/templates/utilities/templatetags/tag.html b/netbox/templates/utilities/templatetags/tag.html
index 0be4e7ca5..8edc83f9c 100644
--- a/netbox/templates/utilities/templatetags/tag.html
+++ b/netbox/templates/utilities/templatetags/tag.html
@@ -1,7 +1,5 @@
 {% load helpers %}
 
-{% if url_name %}
-    <a href="{% url url_name %}?tag={{ tag.slug }}"><span class="label label-default" style="color: {{ tag.color|fgcolor }}; background-color: #{{ tag.color }}">{{ tag }}</span></a>
-{% else %}
-    <span class="label label-default">{{ tag }}</span>
-{% endif %}
+{% if url_name %}<a href="{% url url_name %}?tag={{ tag.slug }}">{% endif %}
+<span class="label label-default" style="color: {{ tag.color|fgcolor }}; background-color: #{{ tag.color }}">{{ tag }}</span>
+{% if url_name %}</a>{% endif %}