diff --git a/core/hdd/src/wlan_hdd_nud_tracking.c b/core/hdd/src/wlan_hdd_nud_tracking.c
index c4fd2bf139e8..ee05e36da311 100644
--- a/core/hdd/src/wlan_hdd_nud_tracking.c
+++ b/core/hdd/src/wlan_hdd_nud_tracking.c
@@ -224,6 +224,7 @@ hdd_handle_nud_fail_sta(struct hdd_context *hdd_ctx,
 			struct hdd_adapter *adapter)
 {
 	struct reject_ap_info ap_info;
+	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
 	qdf_mutex_acquire(&adapter->disconnection_status_lock);
 	if (adapter->disconnection_in_progress) {
@@ -241,7 +242,7 @@ hdd_handle_nud_fail_sta(struct hdd_context *hdd_ctx,
 	hdd_debug("nud fail detected, try roaming to better BSSID, vdev id: %d",
 		  adapter->vdev_id);
 
-	ap_info.bssid = adapter->mac_addr;
+	ap_info.bssid = sta_ctx->conn_info.bssid;
 	ap_info.reject_ap_type = DRIVER_AVOID_TYPE;
 	ucfg_blm_add_bssid_to_reject_list(hdd_ctx->pdev, &ap_info);
 
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 4ed2a0e7a5b7..77a7ebd78d06 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -21735,7 +21735,6 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
 		goto end;
 	default:
 		sme_debug("LFR3: callback reason %d", reason);
-		vdev_roam_params->roam_invoke_in_progress = false;
 		status = QDF_STATUS_E_FAILURE;
 		goto end;
 	}