diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c
index e87f867bbe..8229a4505d 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -734,12 +734,6 @@ static void hdd_send_hang_data(void *data, size_t data_len)
  */
 static void hdd_psoc_shutdown_notify(struct hdd_context *hdd_ctx)
 {
-	/* Notify external threads currently waiting on firmware by forcefully
-	 * completing waiting events with a "reset" status. This will cause the
-	 * event to fail early instead of timing out.
-	 */
-	qdf_complete_wait_events();
-
 	wlan_cfg80211_cleanup_scan_queue(hdd_ctx->pdev, NULL);
 
 	if (ucfg_ipa_is_enabled()) {
@@ -1797,6 +1791,13 @@ wlan_hdd_pld_uevent(struct device *dev, struct pld_uevent_data *event_data)
 		cds_set_target_ready(false);
 		cds_set_recovery_in_progress(true);
 
+		/* Notify external threads currently waiting on firmware
+		 * by forcefully completing waiting events with a "reset"
+		 * status. This will cause the event to fail early instead
+		 * of timing out.
+		 */
+		qdf_complete_wait_events();
+
 		/*
 		 * In case of some platforms, uevent will come to the driver in
 		 * process context. In that case, it is safe to complete the