diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index e335fcaf84d6..47fc6512e338 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -2181,6 +2181,9 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 							  supported_mcs_rate[j].
 							  supported_rate
 							  [rateFlag];
+							maxMCSIdx =
+							  supported_mcs_rate[j].
+							  beacon_rate_index;
 							break;
 						}
 					}
@@ -2188,11 +2191,8 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 					if ((j < MAX_HT_MCS_IDX)
 					    && (currentRate > maxRate)) {
 						maxRate = currentRate;
-						maxSpeedMCS = 1;
-						maxMCSIdx =
-							supported_mcs_rate[j].
-							beacon_rate_index;
 					}
+					maxSpeedMCS = 1;
 				}
 			}
 		}