diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index d38c0de600..64f6f9e947 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -2381,14 +2381,6 @@ pe_roam_synch_callback(struct mac_context *mac_ctx,
 	sir_copy_mac_addr(session_ptr->limReAssocbssId, bss_desc->bssId);
 	ft_session_ptr->csaOffloadEnable = session_ptr->csaOffloadEnable;
 
-	/* Assign default configured nss value in the new session */
-	if (IS_5G_CH(ft_session_ptr->currentOperChannel))
-		ft_session_ptr->vdev_nss = mac_ctx->vdev_type_nss_5g.sta;
-	else
-		ft_session_ptr->vdev_nss = mac_ctx->vdev_type_nss_2g.sta;
-
-	ft_session_ptr->nss = ft_session_ptr->vdev_nss;
-
 	/* Next routine will update nss and vdev_nss with AP's capabilities */
 	lim_fill_ft_session(mac_ctx, bss_desc, ft_session_ptr, session_ptr);
 
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index bbb242a5a0..e4fc72200d 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -583,6 +583,14 @@ void lim_fill_ft_session(struct mac_context *mac,
 	ft_session->limRFBand = lim_get_rf_band(
 				ft_session->currentOperChannel);
 
+	/* Assign default configured nss value in the new session */
+	if (IS_5G_CH(ft_session->currentOperChannel))
+		ft_session->vdev_nss = mac->vdev_type_nss_5g.sta;
+	else
+		ft_session->vdev_nss = mac->vdev_type_nss_2g.sta;
+
+	ft_session->nss = ft_session ->vdev_nss;
+
 	if (ft_session->limRFBand == BAND_2G) {
 		cbEnabledMode = mac->roam.configParam.channelBondingMode24GHz;
 	} else {