diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index c8b96011dc..ef6c4eb6f3 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1351,18 +1351,19 @@ DEFPY (show_interface_nexthop_group,
 
 DEFPY (show_nexthop_group,
        show_nexthop_group_cmd,
-       "show nexthop-group rib <(0-4294967295)$id|[<ip$v4|ipv6$v6>] [vrf <NAME$vrf_name|all$vrf_all>]>",
+       "show nexthop-group rib <(0-4294967295)$id|[singleton <ip$v4|ipv6$v6>] [vrf <NAME$vrf_name|all$vrf_all>]>",
        SHOW_STR
        "Show Nexthop Groups\n"
        "RIB information\n"
        "Nexthop Group ID\n"
+       "Show Singleton Nexthop-Groups\n"
        IP_STR
        IP6_STR
        VRF_FULL_CMD_HELP_STR)
 {
 
 	struct zebra_vrf *zvrf = NULL;
-	afi_t afi = 0;
+	afi_t afi = AFI_UNSPEC;
 
 	if (id)
 		return show_nexthop_group_id_cmd_helper(vty, id);