diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 9a81965773..520b01b768 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -335,13 +335,11 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS)
 		if (IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6)
 		    && !list_isempty(ifc->ifp->nbr_connected))
 			bgp_start_interface_nbrs(bgp, ifc->ifp);
-		else {
+		else if (ifc->address->family == AF_INET6 &&
+			 !IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6)) {
 			addr = ifc->address;
 
 			for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) {
-				if (addr->family == AF_INET)
-					continue;
-
 				/*
 				 * If the Peer's interface name matches the
 				 * interface name for which BGP received the
@@ -355,7 +353,6 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS)
 				if ((peer->conf_if &&
 				     (strcmp(peer->conf_if, ifc->ifp->name) ==
 				      0)) &&
-				    !IN6_IS_ADDR_LINKLOCAL(&addr->u.prefix6) &&
 				    ((IS_MAPPED_IPV6(
 					     &peer->nexthop.v6_global)) ||
 				     IN6_IS_ADDR_LINKLOCAL(