diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 22d4dd8917..d5aff84dae 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1019,8 +1019,6 @@ peer_free (struct peer *peer)
 {
   assert (peer->status == Deleted);
 
-  bgp_unlock(peer->bgp);
-
   /* this /ought/ to have been done already through bgp_stop earlier,
    * but just to be sure.. 
    */
@@ -1092,6 +1090,8 @@ peer_free (struct peer *peer)
 
   bfd_info_free(&(peer->bfd_info));
 
+  bgp_unlock(peer->bgp);
+
   memset (peer, 0, sizeof (struct peer));
   
   XFREE (MTYPE_BGP_PEER, peer);