diff --git a/wmi_unified_non_tlv.c b/wmi_unified_non_tlv.c
index 24f3dd5faf..040f949eef 100644
--- a/wmi_unified_non_tlv.c
+++ b/wmi_unified_non_tlv.c
@@ -512,6 +512,9 @@ static QDF_STATUS convert_host_peer_id_to_target_id_non_tlv(
 	case WMI_HOST_PEER_EXT_STATS_ENABLE:
 		*targ_paramid = WMI_PEER_EXT_STATS_ENABLE;
 		break;
+	/* Populate appropriate targetid once feature is supported in FW */
+	case WMI_HOST_PEER_NSS_VHT160:
+	case WMI_HOST_PEER_NSS_VHT80_80:
 	default:
 		return QDF_STATUS_E_NOSUPPORT;
 	}
@@ -8386,6 +8389,7 @@ static void populate_non_tlv_service(uint32_t *wmi_service)
 	wmi_service[wmi_service_pkt_routing] = WMI_SERVICE_UNAVAILABLE;
 	wmi_service[wmi_service_offchan_tx_wmi] = WMI_SERVICE_UNAVAILABLE;
 	wmi_service[wmi_service_chan_load_info] = WMI_SERVICE_UNAVAILABLE;
+	wmi_service[wmi_service_extended_nss_support] = WMI_SERVICE_UNAVAILABLE;
 }
 
 /**
diff --git a/wmi_unified_tlv.c b/wmi_unified_tlv.c
index 69e80745d8..4a48ddfbb6 100644
--- a/wmi_unified_tlv.c
+++ b/wmi_unified_tlv.c
@@ -634,6 +634,12 @@ static QDF_STATUS convert_host_peer_id_to_target_id_tlv(
 	case WMI_HOST_PEER_SET_DEFAULT_ROUTING:
 		*targ_paramid = WMI_PEER_SET_DEFAULT_ROUTING;
 		break;
+	case WMI_HOST_PEER_NSS_VHT160:
+		*targ_paramid = WMI_PEER_NSS_VHT160;
+		break;
+	case WMI_HOST_PEER_NSS_VHT80_80:
+		*targ_paramid = WMI_PEER_NSS_VHT80_80;
+		break;
 	default:
 		return QDF_STATUS_E_NOSUPPORT;
 	}
@@ -19470,6 +19476,8 @@ static void populate_tlv_service(uint32_t *wmi_service)
 	wmi_service[wmi_service_pkt_routing] = WMI_SERVICE_PKT_ROUTING;
 	wmi_service[wmi_service_offchan_tx_wmi] = WMI_SERVICE_OFFCHAN_TX_WMI;
 	wmi_service[wmi_service_chan_load_info] = WMI_SERVICE_CHAN_LOAD_INFO;
+	wmi_service[wmi_service_extended_nss_support] =
+				WMI_SERVICE_EXTENDED_NSS_SUPPORT;
 }
 
 /**