diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 96b9a0c32a75..f2b1e61067f4 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -7763,7 +7763,7 @@ void hdd_bus_bandwidth_deinit(struct hdd_context *hdd_ctx)
 {
 	hdd_enter();
 
-	hdd_bus_bw_compute_timer_stop(hdd_ctx);
+	QDF_BUG(!hdd_ctx->bus_bw_timer_running);
 
 	qdf_timer_free(&hdd_ctx->bus_bw_timer);
 	qdf_spinlock_destroy(&hdd_ctx->bus_bw_timer_lock);
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index 0ecaf58863a5..839a5f7b5259 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -1200,6 +1200,7 @@ QDF_STATUS hdd_wlan_shutdown(void)
 		return QDF_STATUS_E_FAILURE;
 	}
 
+	hdd_bus_bw_compute_timer_stop(hdd_ctx);
 	policy_mgr_clear_concurrent_session_count(hdd_ctx->hdd_psoc);
 
 	hdd_debug("Invoking packetdump deregistration API");