diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 2f7c584c2d..ed76cfcf60 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -2196,6 +2196,8 @@ peer_group2peer_config_copy (struct peer_group *group, struct peer *peer)
 	}
       peer->update_if = XSTRDUP (MTYPE_PEER_UPDATE_SOURCE, conf->update_if);
     }
+
+  bgp_bfd_peer_group2peer_copy(conf, peer);
 }
 
 static void
@@ -2340,8 +2342,6 @@ peer_group2peer_config_copy_af (struct peer_group *group, struct peer *peer,
       pfilter->usmap.name = NULL;
       pfilter->usmap.map = NULL;
     }
-
-  bgp_bfd_peer_group2peer_copy(conf, peer);
 } 
 
 /* Peer group's remote AS configuration.  */