diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 739c953ebf..5ef49e5108 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -838,6 +838,12 @@ bool bgp_zebra_nexthop_set(union sockunion *local, union sockunion *remote,
 			if (direct)
 				v6_ll_avail = if_get_ipv6_local(
 					ifp, &nexthop->v6_local);
+			/*
+			 * It's fine to not have a v6 LL when using
+			 * update-source loopback/vrf
+			 */
+			if (!v6_ll_avail && if_is_loopback_or_vrf(ifp))
+				v6_ll_avail = true;
 		} else
 		/* Link-local address. */
 		{