diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 026fa41af5..10be5d8fa5 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -71,7 +71,7 @@ extern int allow_delete;
 /* Each route type's string and default distance value. */
 static const struct {
 	int key;
-	int distance;
+	uint8_t distance;
 	uint8_t meta_q_map;
 } route_info[ZEBRA_ROUTE_MAX] = {
 	[ZEBRA_ROUTE_SYSTEM] = {ZEBRA_ROUTE_SYSTEM, 0, 4},
@@ -3407,6 +3407,7 @@ static void check_route_info(void)
 		if (i == ZEBRA_ROUTE_SYSTEM || i == ZEBRA_ROUTE_ALL)
 			continue;
 		assert(route_info[i].key);
+		assert(route_info[i].meta_q_map < MQ_SIZE);
 	}
 }