diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 583604a..00de6b8 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -816,7 +816,7 @@
       if (nexthop == NULL)
 	return;
 
-      if (IN6_IS_ADDR_LINKLOCAL (nexthop) && ! ifindex)
+      if (!ifindex)
 	{
 	  if (info->peer->ifname)
 	    ifindex = ifname2ifindex (info->peer->ifname);
@@ -830,11 +830,12 @@
       for (mpinfo = bgp_info_mpath_first (info); mpinfo;
            mpinfo = bgp_info_mpath_next (mpinfo))
 	{
+	  ifindex = 0;
+
           /* Only global address nexthop exists. */
           if (mpinfo->attr->extra->mp_nexthop_len == 16)
-            {
               nexthop = &mpinfo->attr->extra->mp_nexthop_global;
-            }
+
           /* If both global and link-local address present. */
 	  if (mpinfo->attr->extra->mp_nexthop_len == 32)
             {
@@ -854,12 +855,13 @@
                   ifindex = mpinfo->peer->nexthop.ifp->ifindex;
                 }
             }
+
 	  if (nexthop == NULL)
 	    {
 	      continue;
 	    }
 
-          if (IN6_IS_ADDR_LINKLOCAL (nexthop) && ! ifindex)
+          if (!ifindex)
 	    {
 	      if (mpinfo->peer->ifname)
                 {
@@ -870,6 +872,7 @@
 		  ifindex = mpinfo->peer->nexthop.ifp->ifindex;
 		}
 	    }
+
 	  if (ifindex == 0)
 	    {
 	      continue;