diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index 6dc079f0f..2832f5cc1 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -55,13 +55,8 @@
                                 <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
                             </a>
                             {% with peer=termination.get_cable_peer %}
-                                to
-                                {% if peer.device %}
-                                    <a href="{{ peer.device.get_absolute_url }}">{{ peer.device }}</a>
-                                {% elif peer.circuit %}
-                                    <a href="{{ peer.circuit.get_absolute_url }}">{{ peer.circuit }}</a>
-                                {% endif %}
-                                ({{ peer }})
+                                to <a href="{{ peer.parent_object.get_absolute_url }}">{{ peer.parent_object }}</a>
+                                / {% if peer.get_absolute_url %}<a href="{{ peer.get_absolute_url }}">{{ peer }}</a>{% else %}{{ peer }}{% endif %}
                             {% endwith %}
                         {% else %}
                             {% if perms.dcim.add_cable %}