diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 882fe37..dafbbf7 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1147,7 +1147,7 @@
   UNSET_FLAG (peer->sflags, PEER_STATUS_NSF_MODE);
 
   for (afi = AFI_IP ; afi < AFI_MAX ; afi++)
-    for (safi = SAFI_UNICAST ; safi < SAFI_UNICAST_MULTICAST ; safi++)
+    for (safi = SAFI_UNICAST ; safi < SAFI_RESERVED_3 ; safi++)
       peer->nsf[afi][safi] = 0;
 
   if (peer->t_gr_restart)