diff --git a/netbox/templates/dcim/inc/endpoint_connection.html b/netbox/templates/dcim/inc/endpoint_connection.html
index 1c25a0e28..3169d2ffc 100644
--- a/netbox/templates/dcim/inc/endpoint_connection.html
+++ b/netbox/templates/dcim/inc/endpoint_connection.html
@@ -1,4 +1,4 @@
-{% if path %}
+{% if path.destination_id %}
     {% with endpoint=path.destination %}
         <td><a href="{{ endpoint.parent.get_absolute_url }}">{{ endpoint.parent }}</a></td>
         <td><a href="{{ endpoint.get_absolute_url }}">{{ endpoint }}</a></td>
diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html
index f267479f3..d362b6003 100644
--- a/netbox/templates/dcim/inc/frontport.html
+++ b/netbox/templates/dcim/inc/frontport.html
@@ -24,7 +24,7 @@
     {# Description #}
     <td>{{ frontport.description|placeholder }}</td>
 
-    {# Cable/connection #}
+    {# Cable #}
     {% if frontport.cable %}
         <td>
             <a href="{{ frontport.cable.get_absolute_url }}">{{ frontport.cable }}</a>
diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html
index c1e5482d0..ce6edc883 100644
--- a/netbox/templates/dcim/inc/rearport.html
+++ b/netbox/templates/dcim/inc/rearport.html
@@ -23,7 +23,7 @@
     {# Description #}
     <td>{{ rearport.description|placeholder }}</td>
 
-    {# Cable/connection #}
+    {# Cable #}
     {% if rearport.cable %}
         <td>
             <a href="{{ rearport.cable.get_absolute_url }}">{{ rearport.cable }}</a>