diff --git a/juniper-macros.j2 b/juniper-macros.j2
index c98d0a8..5b75883 100644
--- a/juniper-macros.j2
+++ b/juniper-macros.j2
@@ -252,7 +252,7 @@ routing-options {
                 session-mode automatic;
             }
 {% for interface in device.interfaces.filter(cable__isnull=False) %}
-            neighbor {{ interface.connected_endpoints[0].ip_addresses.first().address.ip }};
+            neighbor {{ interface.connected_endpoints[0].device.primary_ip4.address.ip }};
 {% endfor %}
         }
 {%- endmacro %}