diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 5da912f0a..f100dd3c7 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -136,18 +136,23 @@ class CircuitView(ObjectView):
     queryset = Circuit.objects.prefetch_related('provider', 'type', 'tenant__group')
 
     def get(self, request, pk):
-
         circuit = get_object_or_404(self.queryset, pk=pk)
+
         termination_a = CircuitTermination.objects.restrict(request.user, 'view').prefetch_related(
             'site__region', 'connected_endpoint__device'
         ).filter(
             circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_A
         ).first()
+        if termination_a and termination_a.connected_endpoint:
+            termination_a.ip_addresses = termination_a.connected_endpoint.ip_addresses.restrict(request.user, 'view')
+
         termination_z = CircuitTermination.objects.restrict(request.user, 'view').prefetch_related(
             'site__region', 'connected_endpoint__device'
         ).filter(
             circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_Z
         ).first()
+        if termination_z and termination_z.connected_endpoint:
+            termination_z.ip_addresses = termination_z.connected_endpoint.ip_addresses.restrict(request.user, 'view')
 
         return render(request, 'circuits/circuit.html', {
             'circuit': circuit,
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index 8db715711..30d875657 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -90,7 +90,7 @@
                 <td>IP Addressing</td>
                 <td>
                     {% if termination.connected_endpoint %}
-                        {% for ip in termination.connected_endpoint.ip_addresses.all %}
+                        {% for ip in termination.ip_addresses %}
                             {% if not forloop.first %}<br />{% endif %}
                             <a href="{% url 'ipam:ipaddress' pk=ip.pk %}">{{ ip }}</a> ({{ ip.vrf|default:"Global" }})
                         {% empty %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index c02637e8e..42c322ce2 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -99,7 +99,7 @@
                 <tr>
                     <td>Circuits</td>
                     <td>
-                        <a href="{% url 'circuits:circuit_list' %}?provider={{ provider.slug }}">{{ provider.circuits.count }}</a>
+                        <a href="{% url 'circuits:circuit_list' %}?provider={{ provider.slug }}">{{ circuits_table.rows|length }}</a>
                     </td>
                 </tr>
             </table>