diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c
index 6e30d4f846..468bf47715 100644
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@ -526,8 +526,10 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
 		if (peer->nexthop.v4.s_addr != INADDR_ANY &&
 		    (IN6_IS_ADDR_UNSPECIFIED(mod_v6nhg) ||
 		     (IN6_IS_ADDR_LINKLOCAL(mod_v6nhg) &&
-		      peer->connection->su.sa.sa_family == AF_INET6 &&
-		      paf->afi == AFI_IP))) {
+		      ((peer->connection->su.sa.sa_family == AF_INET6 &&
+			paf->afi == AFI_IP) ||
+		       (peer->connection->su.sa.sa_family == AF_INET &&
+			paf->afi == AFI_IP6))))) {
 			ipv4_to_ipv4_mapped_ipv6(mod_v6nhg, peer->nexthop.v4);
 			gnh_modified = 1;
 		}