diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 78f077eaca..e8151d94ed 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -10567,8 +10567,8 @@ DEFUN(show_ip_bgp_statistics_all, show_ip_bgp_statistics_all_cmd,
 {
 	bool uj = use_json(argc, argv);
 	struct bgp *bgp = NULL;
-	safi_t safi;
-	afi_t afi;
+	safi_t safi = SAFI_UNICAST;
+	afi_t afi = AFI_IP6;
 	int idx = 0;
 	struct json_object *json_all = NULL;
 	struct json_object *json_afi_safi = NULL;
@@ -10626,8 +10626,8 @@ DEFUN (show_ip_bgp_l2vpn_evpn_statistics,
        "BGP RIB advertisement statistics\n"
        JSON_STR)
 {
-	afi_t afi;
-	safi_t safi;
+	afi_t afi = AFI_IP6;
+	safi_t safi = SAFI_UNICAST;
 	struct bgp *bgp = NULL;
 	int idx = 0, ret;
 	bool uj = use_json(argc, argv);
@@ -10666,8 +10666,8 @@ DEFUN(show_ip_bgp_afi_safi_statistics, show_ip_bgp_afi_safi_statistics_cmd,
 	      BGP_SAFI_WITH_LABEL_HELP_STR
       "BGP RIB advertisement statistics\n" JSON_STR)
 {
-	afi_t afi;
-	safi_t safi;
+	afi_t afi = AFI_IP6;
+	safi_t safi = SAFI_UNICAST;
 	struct bgp *bgp = NULL;
 	int idx = 0, ret;
 	bool uj = use_json(argc, argv);
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 8266b76111..9890a3f071 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -9087,7 +9087,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
 			}
 		}
 
-		paf = peer_af_find(peer, afi, pfx_rcd_safi);
+		paf = peer_af_find(peer, afi, safi);
 		filter = &peer->filter[afi][safi];
 
 		count++;