diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index e76329fca6..aa335a3fbd 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -4797,22 +4797,21 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
 						false);
 	}
 
+	/* rfc7999:
+	 * A BGP speaker receiving an announcement tagged with the
+	 * BLACKHOLE community SHOULD add the NO_ADVERTISE or
+	 * NO_EXPORT community as defined in RFC1997, or a
+	 * similar community, to prevent propagation of the
+	 * prefix outside the local AS. The community to prevent
+	 * propagation SHOULD be chosen according to the operator's
+	 * routing policy.
+	 */
+	if (bgp_attr_get_community(&new_attr) &&
+	    community_include(bgp_attr_get_community(&new_attr),
+			      COMMUNITY_BLACKHOLE))
+		bgp_attr_add_no_export_community(&new_attr);
+
 	if (peer->sort == BGP_PEER_EBGP) {
-
-		/* rfc7999:
-		 * A BGP speaker receiving an announcement tagged with the
-		 * BLACKHOLE community SHOULD add the NO_ADVERTISE or
-		 * NO_EXPORT community as defined in RFC1997, or a
-		 * similar community, to prevent propagation of the
-		 * prefix outside the local AS. The community to prevent
-		 * propagation SHOULD be chosen according to the operator's
-		 * routing policy.
-		 */
-		if (bgp_attr_get_community(&new_attr) &&
-		    community_include(bgp_attr_get_community(&new_attr),
-				      COMMUNITY_BLACKHOLE))
-			bgp_attr_add_no_export_community(&new_attr);
-
 		/* If we receive the graceful-shutdown community from an eBGP
 		 * peer we must lower local-preference */
 		if (bgp_attr_get_community(&new_attr) &&
diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst
index a569a9af28..aa62d274f0 100644
--- a/doc/user/bgp.rst
+++ b/doc/user/bgp.rst
@@ -2482,7 +2482,7 @@ is 4 octet long. The following format is used to define the community value.
 ``blackhole``
    ``blackhole`` represents well-known communities value ``BLACKHOLE``
    ``0xFFFF029A`` ``65535:666``. :rfc:`7999` documents sending prefixes to
-   EBGP peers and upstream for the purpose of blackholing traffic.
+   peers and upstream for the purpose of blackholing traffic.
    Prefixes tagged with the this community should normally not be
    re-advertised from neighbors of the originating network. Upon receiving
    ``BLACKHOLE`` community from a BGP speaker, ``NO_ADVERTISE`` community