diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index ce66d9da2..3e175bfaf 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -93,33 +93,16 @@
         {# Connected to a CircuitTermination #}
         {% with iface.connected_endpoint.get_peer_termination as peer_termination %}
             {% if peer_termination %}
-                {% if peer_termination.connected_endpoint %}
-                    <td>
-                        <a href="{% url 'dcim:device' pk=peer_termination.connected_endpoint.device.pk %}">
-                            {{ peer_termination.connected_endpoint.device }}
-                        </a><br/>
-                        <small>via <i class="fa fa-fw fa-globe" title="Circuit"></i>
-                            <a href="{{ iface.connected_endpoint.circuit.get_absolute_url }}">
-                                {{ iface.connected_endpoint.circuit.provider }}
-                                {{ iface.connected_endpoint.circuit }}
-                            </a>
-                        </small>
-                    </td>
-                    <td>
-                        {{ peer_termination.connected_endpoint }}
-                    </td>
-                {% else %}
-                    <td colspan="2">
-                        <a href="{% url 'dcim:site' slug=peer_termination.site.slug %}">
-                            {{ peer_termination.site }}
-                        </a>
-                        via <i class="fa fa-fw fa-globe" title="Circuit"></i>
-                        <a href="{{ iface.connected_endpoint.circuit.get_absolute_url }}">
-                            {{ iface.connected_endpoint.circuit.provider }}
-                            {{ iface.connected_endpoint.circuit }}
-                        </a>
-                    </td>
-                {% endif %}
+                <td colspan="2">
+                    <a href="{% url 'dcim:site' slug=peer_termination.site.slug %}">
+                        {{ peer_termination.site }}
+                    </a>
+                    via <i class="fa fa-fw fa-globe" title="Circuit"></i>
+                    <a href="{{ iface.connected_endpoint.circuit.get_absolute_url }}">
+                        {{ iface.connected_endpoint.circuit.provider }}
+                        {{ iface.connected_endpoint.circuit }}
+                    </a>
+                </td>
             {% else %}
                 <td colspan="2">
                     <i class="fa fa-fw fa-globe" title="Circuit"></i>