diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index b8d090231..75869db52 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -31,7 +31,7 @@
         {% if iface.description %}
             {{ iface.description }}<br/>
         {% endif %}
-        {% for tag in iface.tags.all.unrestricted %}
+        {% for tag in iface.tags.all %}
             {% tag tag %}
         {% empty %}
             {% if not iface.description %}&mdash;{% endif %}
diff --git a/netbox/templates/extras/inc/tags_panel.html b/netbox/templates/extras/inc/tags_panel.html
index d03932354..2024d4ab7 100644
--- a/netbox/templates/extras/inc/tags_panel.html
+++ b/netbox/templates/extras/inc/tags_panel.html
@@ -4,7 +4,7 @@
         <strong>Tags</strong>
     </div>
     <div class="panel-body">
-        {% for tag in tags.all.unrestricted %}
+        {% for tag in tags.all %}
             {% tag tag url %}
         {% empty %}
             <span class="text-muted">No tags assigned</span>
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index a4f15a836..0144ea2d1 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -202,7 +202,7 @@ class TagColumn(tables.TemplateColumn):
     Display a list of tags assigned to the object.
     """
     template_code = """
-    {% for tag in value.all.unrestricted %}
+    {% for tag in value.all %}
         {% include 'utilities/templatetags/tag.html' %}
     {% empty %}
         <span class="text-muted">&mdash;</span>