diff --git a/components/mlme/dispatcher/inc/cfg_qos.h b/components/mlme/dispatcher/inc/cfg_qos.h
index db28b214dd..6d35ce2d96 100644
--- a/components/mlme/dispatcher/inc/cfg_qos.h
+++ b/components/mlme/dispatcher/inc/cfg_qos.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -402,7 +402,7 @@
  * gTxAggSwRetry - Configure Tx aggregation sw retry
  * @Min: 0
  * @Max: 64
- * @Default: 0
+ * @Default: 16
  *
  * gTxAggSwRetry gives an option to configure Tx aggregation sw
  * retry. This can be useful in debugging throughput issues.
@@ -419,7 +419,7 @@
 			"gTxAggSwRetry", \
 			0, \
 			64, \
-			0, \
+			16, \
 			CFG_VALUE_OR_DEFAULT, \
 			"Tx aggregation retry value")
 /*
@@ -427,7 +427,7 @@
  * gTxNonAggSwRetry - Configure Tx non aggregation sw retry
  * @Min: 0
  * @Max: 64
- * @Default: 0
+ * @Default: 16
  *
  * gTxNonAggSwRetry gives an option to configure Tx non aggregation sw
  * retry. This can be useful in debugging throughput issues.
@@ -444,7 +444,7 @@
 			"gTxNonAggSwRetry", \
 			0, \
 			64, \
-			0, \
+			16, \
 			CFG_VALUE_OR_DEFAULT, \
 			"Tx non aggregation retry value")
 /*
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 84525e5fb7..2b73d8c3db 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -2592,7 +2592,7 @@ QDF_STATUS wma_post_vdev_create_setup(struct wlan_objmgr_vdev *vdev)
 		status = wma_set_sw_retry_threshold(
 				vdev_id,
 				qos_aggr->tx_non_aggr_sw_retry_threshold,
-				WMI_PDEV_PARAM_AGG_SW_RETRY_TH);
+				WMI_PDEV_PARAM_NON_AGG_SW_RETRY_TH);
 		if (QDF_IS_STATUS_ERROR(status))
 			WMA_LOGE("failed to set sw retry threshold tx non aggr(status = %d)",
 				 status);