diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index e3d50c6f930a..06081ef0b89f 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -1426,15 +1426,6 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 		cmd->ht_flag = 1;
 		cmd->qos_flag = 1;
 		cmd->peer_rate_caps |= WMI_RC_HT_FLAG;
-
-		if (params->ch_width) {
-			cmd->bw_40 = 1;
-			cmd->peer_rate_caps |= WMI_RC_CW40_FLAG;
-			if (params->fShortGI40Mhz)
-				cmd->peer_rate_caps |= WMI_RC_SGI_FLAG;
-		} else if (params->fShortGI20Mhz) {
-			cmd->peer_rate_caps |= WMI_RC_SGI_FLAG;
-		}
 	}
 
 	if (params->vhtCapable) {
@@ -1444,6 +1435,15 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 		cmd->peer_rate_caps |= WMI_RC_HT_FLAG;
 	}
 
+	if (params->ch_width) {
+		cmd->bw_40 = 1;
+		cmd->peer_rate_caps |= WMI_RC_CW40_FLAG;
+		if (params->fShortGI40Mhz)
+			cmd->peer_rate_caps |= WMI_RC_SGI_FLAG;
+	} else if (params->fShortGI20Mhz) {
+		cmd->peer_rate_caps |= WMI_RC_SGI_FLAG;
+	}
+
 	if (params->ch_width == CH_WIDTH_80MHZ)
 		cmd->bw_80 = 1;
 	else if (params->ch_width == CH_WIDTH_160MHZ)