diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
index ad4f15c9d..dee57e28b 100644
--- a/netbox/templates/dcim/consoleport.html
+++ b/netbox/templates/dcim/consoleport.html
@@ -60,7 +60,7 @@
               {% if object.mark_connected %}
                 <span class="text-success"><i class="mdi mdi-check-bold"></i></span> Marked as connected
               {% elif object.cable %}
-                {% include 'dcim/inc/connection_endpoints.html' %}
+                {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:consoleport_trace' %}
               {% else %}
                 <div class="text-muted">
                   Not Connected
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index a543cd5ff..cd447d11d 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -60,7 +60,7 @@
               {% if object.mark_connected %}
                 <span class="text-success"><i class="mdi mdi-check-bold"></i></span> Marked as connected
               {% elif object.cable %}
-                {% include 'dcim/inc/connection_endpoints.html' %}
+                {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:consoleserverport_trace' %}
               {% else %}
                 <div class="text-muted">
                   Not Connected
diff --git a/netbox/templates/dcim/inc/connection_endpoints.html b/netbox/templates/dcim/inc/connection_endpoints.html
index fb994a492..fb395ca74 100644
--- a/netbox/templates/dcim/inc/connection_endpoints.html
+++ b/netbox/templates/dcim/inc/connection_endpoints.html
@@ -3,7 +3,7 @@
     <th scope="row">Cable</th>
     <td>
       {{ object.cable|linkify }}
-      <a href="{% url 'dcim:interface_trace' pk=object.pk %}" class="btn btn-primary btn-sm lh-1" title="Trace">
+      <a href="{% url trace_url pk=object.pk %}" class="btn btn-primary btn-sm lh-1" title="Trace">
         <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
       </a>
     </td>
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index b593b7c00..f10e60490 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -145,7 +145,7 @@
                 <span class="text-success"><i class="mdi mdi-check-bold"></i></span> Marked as Connected
               </div>
             {% elif object.cable %}
-              {% include 'dcim/inc/connection_endpoints.html' %}
+              {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:interface_trace' %}
             {% elif object.wireless_link %}
               <table class="table table-hover">
                 <tr>
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index 6387c111d..4b8a6dc34 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -112,7 +112,7 @@
               <span class="text-success"><i class="mdi mdi-check-bold"></i></span> Marked as connected
             </div>
           {% elif object.cable %}
-            {% include 'dcim/inc/connection_endpoints.html' %}
+            {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:powerfeed_trace' %}
           {% else %}
             <div class="text-muted">
               Not connected
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index fb6de8ddb..b7ac8ba8e 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -66,7 +66,7 @@
                   <span class="text-success"><i class="mdi mdi-check-bold"></i></span> Marked as Connected
                 </div>
               {% elif object.cable %}
-                {% include 'dcim/inc/connection_endpoints.html' %}
+                {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:poweroutlet_trace' %}
               {% else %}
                 <div class="text-muted">
                   Not Connected
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index 476ee44d3..d0ee779cb 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -66,7 +66,7 @@
                   <span class="text-success"><i class="mdi mdi-check-bold"></i></span> Marked as Connected
                 </div>
               {% elif object.cable %}
-                {% include 'dcim/inc/connection_endpoints.html' %}
+                {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:powerport_trace' %}
               {% else %}
                 <div class="text-muted">
                   Not Connected