diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 491a795490..309e9077dc 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -10170,7 +10170,9 @@ bgp_show_summary_afi_safi (struct vty *vty, struct bgp *bgp, int afi, int safi,
           if (safi == SAFI_MPLS_VPN) /* handle special cases to match zebra.h */
             safi = SAFI_ENCAP;
           else
-              safi++;
+            safi++;
+          if (safi == SAFI_RESERVED_3) /* handle special cases to match zebra.h */
+            safi++;
           if (! safi_wildcard)
             safi = SAFI_MAX;
         }