diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index 7a8482c7a6..b2e3cfce60 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -10014,61 +10014,6 @@ static bool is_diag_event_tlv(uint32_t event_id)
 	return false;
 }
 
-static uint16_t wmi_tag_vdev_set_cmd(wmi_unified_t wmi_hdl, wmi_buf_t buf)
-{
-	wmi_vdev_set_param_cmd_fixed_param *set_cmd;
-
-	set_cmd = (wmi_vdev_set_param_cmd_fixed_param *)wmi_buf_data(buf);
-
-	switch (set_cmd->param_id) {
-	case WMI_VDEV_PARAM_LISTEN_INTERVAL:
-	case WMI_VDEV_PARAM_DTIM_POLICY:
-	case WMI_STA_PS_PARAM_INACTIVITY_TIME:
-	case WMI_STA_PS_PARAM_MAX_RESET_ITO_COUNT_ON_TIM_NO_TXRX:
-		return HTC_TX_PACKET_TAG_AUTO_PM;
-	default:
-		break;
-	}
-
-	return 0;
-}
-
-static uint16_t wmi_tag_sta_powersave_cmd(wmi_unified_t wmi_hdl, wmi_buf_t buf)
-{
-	wmi_sta_powersave_param_cmd_fixed_param *ps_cmd;
-
-	ps_cmd = (wmi_sta_powersave_param_cmd_fixed_param *)wmi_buf_data(buf);
-
-	switch (ps_cmd->param) {
-	case WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD:
-	case WMI_STA_PS_PARAM_INACTIVITY_TIME:
-	case WMI_STA_PS_ENABLE_QPOWER:
-		return HTC_TX_PACKET_TAG_AUTO_PM;
-	default:
-		break;
-	}
-
-	return 0;
-}
-
-static uint16_t wmi_tag_common_cmd(wmi_unified_t wmi_hdl, wmi_buf_t buf,
-				   uint32_t cmd_id)
-{
-	if (qdf_atomic_read(&wmi_hdl->is_wow_bus_suspended))
-		return 0;
-
-	switch (cmd_id) {
-	case WMI_VDEV_SET_PARAM_CMDID:
-		return wmi_tag_vdev_set_cmd(wmi_hdl, buf);
-	case WMI_STA_POWERSAVE_PARAM_CMDID:
-		return wmi_tag_sta_powersave_cmd(wmi_hdl, buf);
-	default:
-		break;
-	}
-
-	return 0;
-}
-
 static uint16_t wmi_tag_fw_hang_cmd(wmi_unified_t wmi_handle)
 {
 	uint16_t tag = 0;
@@ -10105,6 +10050,7 @@ static uint16_t wmi_set_htc_tx_tag_tlv(wmi_unified_t wmi_handle,
 	case WMI_PDEV_SUSPEND_CMDID:
 	case WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID:
 	case WMI_PDEV_RESUME_CMDID:
+	case WMI_HB_SET_ENABLE_CMDID:
 #ifdef FEATURE_WLAN_D0WOW
 	case WMI_D0_WOW_ENABLE_DISABLE_CMDID:
 #endif
@@ -10113,9 +10059,6 @@ static uint16_t wmi_set_htc_tx_tag_tlv(wmi_unified_t wmi_handle,
 	case WMI_FORCE_FW_HANG_CMDID:
 		htc_tx_tag = wmi_tag_fw_hang_cmd(wmi_handle);
 		break;
-	case WMI_VDEV_SET_PARAM_CMDID:
-	case WMI_STA_POWERSAVE_PARAM_CMDID:
-		htc_tx_tag = wmi_tag_common_cmd(wmi_handle, buf, cmd_id);
 	default:
 		break;
 	}