diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index f374554215cc..5fa3c7f9b625 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -6857,8 +6857,8 @@ static void csr_roam_process_start_bss_success(struct mac_context *mac_ctx,
 	struct bss_description *bss_desc = NULL;
 	struct csr_roam_info *roam_info;
 	struct start_bss_rsp *start_bss_rsp = NULL;
-	eRoamCmdStatus roam_status;
-	eCsrRoamResult roam_result;
+	eRoamCmdStatus roam_status = eCSR_ROAM_INFRA_IND;
+	eCsrRoamResult roam_result = eCSR_ROAM_RESULT_INFRA_STARTED;
 	tSirMacAddr bcast_mac = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 	QDF_STATUS status;
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
@@ -6931,10 +6931,6 @@ static void csr_roam_process_start_bss_success(struct mac_context *mac_ctx,
 	 * handler of eSIR_SME_JOINED_NEW_BSS will trigger the connection start
 	 * indication in Vista
 	 */
-	if (CSR_IS_INFRA_AP(profile)) {
-		roam_status = eCSR_ROAM_INFRA_IND;
-		roam_result = eCSR_ROAM_RESULT_INFRA_STARTED;
-	}
 	roam_info->staId = (uint8_t)start_bss_rsp->staId;
 	if (CSR_IS_NDI(profile)) {
 		csr_roam_update_ndp_return_params(mac_ctx,
@@ -7582,11 +7578,12 @@ static bool csr_roam_process_results(struct mac_context *mac_ctx, tSmeCmd *cmd,
 	struct csr_roam_info *roam_info;
 	uint32_t session_id = cmd->vdev_id;
 	struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
-	struct csr_roam_profile *profile = &cmd->u.roamCmd.roamProfile;
-	eRoamCmdStatus roam_status;
-	eCsrRoamResult roam_result;
+	struct csr_roam_profile *profile;
+	eRoamCmdStatus roam_status = eCSR_ROAM_INFRA_IND;
+	eCsrRoamResult roam_result = eCSR_ROAM_RESULT_INFRA_START_FAILED;
 	struct start_bss_rsp  *start_bss_rsp = NULL;
 
+	profile = &cmd->u.roamCmd.roamProfile;
 	if (!session) {
 		sme_err("session %d not found ", session_id);
 		return false;
@@ -7607,10 +7604,7 @@ static bool csr_roam_process_results(struct mac_context *mac_ctx, tSmeCmd *cmd,
 		break;
 	case eCsrStartBssFailure:
 		start_bss_rsp = (struct start_bss_rsp *)context;
-		if (CSR_IS_INFRA_AP(profile)) {
-			roam_status = eCSR_ROAM_INFRA_IND;
-			roam_result = eCSR_ROAM_RESULT_INFRA_START_FAILED;
-		}
+
 		if (CSR_IS_NDI(profile)) {
 			csr_roam_update_ndp_return_params(mac_ctx,
 							  eCsrStartBssFailure,