diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 1fd7aff00152..f64871f0d712 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -5737,6 +5737,21 @@ static int hdd_config_agg_retry(struct hdd_adapter *adapter,
 				   retry, PDEV_CMD);
 }
 
+static int hdd_config_mgmt_retry(struct hdd_adapter *adapter,
+				 const struct nlattr *attr)
+{
+	uint8_t retry;
+	int param_id;
+
+	retry = nla_get_u8(attr);
+	retry = retry > CFG_MGMT_RETRY_MAX ?
+		CFG_MGMT_RETRY_MAX : retry;
+	param_id = WMI_PDEV_PARAM_MGMT_RETRY_LIMIT;
+
+	return wma_cli_set_command(adapter->session_id, param_id,
+				   retry, PDEV_CMD);
+}
+
 static int hdd_config_guard_time(struct hdd_adapter *adapter,
 				 const struct nlattr *attr)
 {
@@ -5847,6 +5862,8 @@ static const struct independent_setters independent_setters[] = {
 	 hdd_config_non_agg_retry},
 	{QCA_WLAN_VENDOR_ATTR_CONFIG_AGG_RETRY,
 	 hdd_config_agg_retry},
+	{QCA_WLAN_VENDOR_ATTR_CONFIG_MGMT_RETRY,
+	 hdd_config_mgmt_retry},
 };
 
 /**
@@ -6045,15 +6062,6 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
 			access_policy);
 	}
 
-	if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_MGMT_RETRY]) {
-		retry = nla_get_u8(tb[QCA_WLAN_VENDOR_ATTR_CONFIG_MGMT_RETRY]);
-		retry = retry > CFG_MGMT_RETRY_MAX ?
-				CFG_MGMT_RETRY_MAX : retry;
-		param_id = WMI_PDEV_PARAM_MGMT_RETRY_LIMIT;
-		ret_val = wma_cli_set_command(adapter->session_id, param_id,
-					      retry, PDEV_CMD);
-	}
-
 	if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_CTRL_RETRY]) {
 		retry = nla_get_u8(tb[QCA_WLAN_VENDOR_ATTR_CONFIG_CTRL_RETRY]);
 		retry = retry > CFG_CTRL_RETRY_MAX ?