diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index e3214c6c058f..051a7a0d059e 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -7586,15 +7586,6 @@ static void csr_process_fils_join_rsp(struct mac_context *mac_ctx,
 		goto process_fils_join_rsp_fail;
 	}
 
-	status = csr_issue_set_context_req_helper(mac_ctx, profile,
-			session_id, &bss_desc->bssId, true, false,
-			eSIR_RX_ONLY, 2, roam_info->fils_join_rsp->gtk_len,
-			roam_info->fils_join_rsp->gtk);
-	if (QDF_IS_STATUS_ERROR(status)) {
-		sme_err("Set context for bcast fail");
-		goto process_fils_join_rsp_fail;
-	}
-
 	status = csr_issue_set_context_req_helper(mac_ctx, profile,
 				session_id, &bss_desc->bssId, true,
 				true, eSIR_TX_RX, 0,
@@ -7604,6 +7595,15 @@ static void csr_process_fils_join_rsp(struct mac_context *mac_ctx,
 		sme_err("Set context for unicast fail");
 		goto process_fils_join_rsp_fail;
 	}
+
+	status = csr_issue_set_context_req_helper(mac_ctx, profile,
+			session_id, &bss_desc->bssId, true, false,
+			eSIR_RX_ONLY, 2, roam_info->fils_join_rsp->gtk_len,
+			roam_info->fils_join_rsp->gtk);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		sme_err("Set context for bcast fail");
+		goto process_fils_join_rsp_fail;
+	}
 	return;
 
 process_fils_join_rsp_fail: