diff --git a/staticd/static_routes.c b/staticd/static_routes.c
index ccbb98bd11..0c39058a8d 100644
--- a/staticd/static_routes.c
+++ b/staticd/static_routes.c
@@ -209,7 +209,8 @@ bool static_add_nexthop_validate(const char *nh_vrf_name,
 					vrf->vrf_id))
 			return false;
 		break;
-	default:
+	case STATIC_IFNAME:
+	case STATIC_BLACKHOLE:
 		break;
 	}
 
@@ -302,7 +303,8 @@ struct static_nexthop *static_add_nexthop(struct static_path *pn,
 	case STATIC_IPV6_GATEWAY_IFNAME:
 		nh->addr.ipv6 = ipaddr->ipaddr_v6;
 		break;
-	default:
+	case STATIC_IFNAME:
+	case STATIC_BLACKHOLE:
 		break;
 	}
 	/*
diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index c5bea755ec..f9c88f8bec 100644
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -135,7 +135,9 @@ static int static_route_nb_run(struct vty *vty, struct static_route_args *args)
 		if (args->source)
 			assert(!!str2prefix(args->source, &src));
 		break;
-	default:
+	case AFI_L2VPN:
+	case AFI_UNSPEC:
+	case AFI_MAX:
 		break;
 	}