diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index e1eda12b8..7261ed997 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -15,6 +15,7 @@
 * [#6846](https://github.com/netbox-community/netbox/issues/6846) - Form-driven REST API calls should use brief mode
 * [#6871](https://github.com/netbox-community/netbox/issues/6871) - Support dynamic tag types in GraphQL API
 * [#6894](https://github.com/netbox-community/netbox/issues/6894) - Fix available IP generation for prefix assigned to a VRF
+* [#6953](https://github.com/netbox-community/netbox/issues/6953) - Remove change log tab from non-applicable object views
 
 ---
 
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index 480dab594..93b0b0251 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -62,20 +62,22 @@
     {% endblock tab_items %}
     {% if perms.extras.view_journalentry %}
       {% with journal_viewname=object|viewname:'journal' %}
-      {% url journal_viewname pk=object.pk as journal_url %}
-      {% if journal_url %}
-        <li role="presentation" class="nav-item">
-          <a href="{{ journal_url }}" class="nav-link{% if active_tab == 'journal'%} active{% endif %}">Journal</a>
-        </li>
-      {% endif %}
+        {% url journal_viewname pk=object.pk as journal_url %}
+        {% if journal_url %}
+          <li role="presentation" class="nav-item">
+            <a href="{{ journal_url }}" class="nav-link{% if active_tab == 'journal'%} active{% endif %}">Journal</a>
+          </li>
+        {% endif %}
       {% endwith %}
     {% endif %}
     {% if perms.extras.view_objectchange %}
       {% with changelog_viewname=object|viewname:'changelog' %}
-      {% url changelog_viewname pk=object.pk as changelog_url %}
-        <li role="presentation" class="nav-item">
-            <a href="{{ changelog_url }}" class="nav-link{% if active_tab == 'changelog'%} active{% endif %}">Change Log</a>
-        </li>
+        {% url changelog_viewname pk=object.pk as changelog_url %}
+        {% if changelog_url %}
+          <li role="presentation" class="nav-item">
+              <a href="{{ changelog_url }}" class="nav-link{% if active_tab == 'changelog'%} active{% endif %}">Change Log</a>
+          </li>
+        {% endif %}
       {% endwith %}
     {% endif %}
   </ul>