diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c
index 66e1cd477bd3..450d18c943bc 100644
--- a/core/bmi/src/ol_fw.c
+++ b/core/bmi/src/ol_fw.c
@@ -709,13 +709,12 @@ void ol_target_failure(void *instance, QDF_STATUS status)
 		return;
 	}
 
-	cds_set_recovery_in_progress(true);
 	if (cds_is_load_or_unload_in_progress()) {
-		cds_set_recovery_in_progress(false);
 		BMI_ERR("%s: Loading/Unloading is in progress, ignore!",
 		       __func__);
 		return;
 	}
+	cds_set_recovery_in_progress(true);
 
 	ret = hif_check_fw_reg(scn);
 	if (0 == ret) {
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 40cbc5ea0771..dabf33015f76 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -11278,8 +11278,6 @@ static void __hdd_module_exit(void)
 	pr_info("%s: Unloading driver v%s\n", WLAN_MODULE_NAME,
 		QWLAN_VERSIONSTR);
 
-	cds_set_unload_in_progress(true);
-
 	hdd_wait_for_recovery_completion();
 
 	wlan_hdd_unregister_driver();