diff --git a/src/cntlr_map.c b/src/cntlr_map.c
index 90a1d6786f794e2e7345282638fa1c6cd31aaf21..02676970f57258c8fcbdb4f2431587f393ad02e3 100644
--- a/src/cntlr_map.c
+++ b/src/cntlr_map.c
@@ -1114,11 +1114,11 @@ int handle_ap_metrics_response(void *cntlr, struct cmdu_buff *cmdu)
 	struct tlv *tv[6][16] = { 0 };
 	struct tlv_policy metric_policy[] = {
 		[0] = { .type = MAP_TLV_AP_METRICS, .present = TLV_PRESENT_MORE },
-		[1] = { .type = MAP_TLV_ASSOCIATED_STA_TRAFFIC_STATS, .present = TLV_PRESENT_MORE },
-		[2] = { .type = MAP_TLV_ASSOCIATED_STA_LINK_METRICS, .present = TLV_PRESENT_MORE },
+		[1] = { .type = MAP_TLV_ASSOCIATED_STA_TRAFFIC_STATS, .present = TLV_PRESENT_OPTIONAL_MORE },
+		[2] = { .type = MAP_TLV_ASSOCIATED_STA_LINK_METRICS, .present = TLV_PRESENT_OPTIONAL_MORE },
 		[3] = { .type = MAP_TLV_AP_EXTENDED_METRICS, .present = TLV_PRESENT_MORE },
-		[4] = { .type = MAP_TLV_RADIO_METRICS, .present = TLV_PRESENT_MORE },
-		[5] = { .type = MAP_TLV_ASSOCIATED_STA_EXT_LINK_METRICS, .present = TLV_PRESENT_MORE }
+		[4] = { .type = MAP_TLV_RADIO_METRICS, .present = TLV_PRESENT_OPTIONAL_MORE },
+		[5] = { .type = MAP_TLV_ASSOCIATED_STA_EXT_LINK_METRICS, .present = TLV_PRESENT_OPTIONAL_MORE }
 	};
 	struct tlv_ap_metrics *p;
 
diff --git a/src/cntlr_map_debug.c b/src/cntlr_map_debug.c
index 632aca6557b3bdb79089be47b6692929b809547f..2bde161dae37fcf61a90748e5a83985de830127b 100644
--- a/src/cntlr_map_debug.c
+++ b/src/cntlr_map_debug.c
@@ -688,11 +688,11 @@ int debug_ap_metrics_response(void *cntlr, struct cmdu_buff *cmdu)
 	struct tlv *tv[6][16] = { 0 };
 	struct tlv_policy metric_policy[] = {
 		[0] = { .type = MAP_TLV_AP_METRICS, .present = TLV_PRESENT_MORE },
-		[1] = { .type = MAP_TLV_ASSOCIATED_STA_TRAFFIC_STATS, .present = TLV_PRESENT_MORE },
-		[2] = { .type = MAP_TLV_ASSOCIATED_STA_LINK_METRICS, .present = TLV_PRESENT_MORE },
+		[1] = { .type = MAP_TLV_ASSOCIATED_STA_TRAFFIC_STATS, .present = TLV_PRESENT_OPTIONAL_MORE },
+		[2] = { .type = MAP_TLV_ASSOCIATED_STA_LINK_METRICS, .present = TLV_PRESENT_OPTIONAL_MORE },
 		[3] = { .type = MAP_TLV_AP_EXTENDED_METRICS, .present = TLV_PRESENT_MORE },
-		[4] = { .type = MAP_TLV_RADIO_METRICS, .present = TLV_PRESENT_MORE },
-		[5] = { .type = MAP_TLV_ASSOCIATED_STA_EXT_LINK_METRICS, .present = TLV_PRESENT_MORE }
+		[4] = { .type = MAP_TLV_RADIO_METRICS, .present = TLV_PRESENT_OPTIONAL_MORE },
+		[5] = { .type = MAP_TLV_ASSOCIATED_STA_EXT_LINK_METRICS, .present = TLV_PRESENT_OPTIONAL_MORE }
 	};
 
 	trace("%s: --->\n", __func__);