diff --git a/drivers/gpu/nvgpu/common/pmu/fw/fw.c b/drivers/gpu/nvgpu/common/pmu/fw/fw.c
index ca0b25449..cbc78d229 100644
--- a/drivers/gpu/nvgpu/common/pmu/fw/fw.c
+++ b/drivers/gpu/nvgpu/common/pmu/fw/fw.c
@@ -65,6 +65,10 @@ void nvgpu_pmu_fw_state_change(struct gk20a *g, struct nvgpu_pmu *pmu,
 	nvgpu_smp_wmb();
 	pmu->fw->state = pmu_state;
 
+	/* Set a sticky flag to indicate PMU state exit */
+	if (pmu_state == PMU_FW_STATE_EXIT) {
+		pmu->pg->pg_init.state_destroy = true;
+	}
 	if (post_change_event) {
 		if (g->can_elpg) {
 			pmu->pg->pg_init.state_change = true;
diff --git a/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c
index eed137dd0..c343a3239 100644
--- a/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c
+++ b/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c
@@ -798,6 +798,8 @@ static void pmu_pg_kill_task(struct gk20a *g, struct nvgpu_pmu *pmu,
 			nvgpu_udelay(2);
 		} while (nvgpu_timeout_expired_msg(&timeout,
 			"timeout - waiting PMU state machine thread stop") == 0);
+		/* Reset the flag for next time */
+		pmu->pg->pg_init.state_destroy = false;
 	} else {
 		nvgpu_thread_join(&pg->pg_init.state_task);
 	}
@@ -821,7 +823,7 @@ static int pmu_pg_task(void *arg)
 		pmu->pg->pg_init.state_change = false;
 		pmu_state = nvgpu_pmu_get_fw_state(g, pmu);
 
-		if (pmu_state == PMU_FW_STATE_EXIT) {
+		if (pmu->pg->pg_init.state_destroy) {
 			nvgpu_pmu_dbg(g, "pmu state exit");
 			break;
 		}
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmu/pmu_pg.h b/drivers/gpu/nvgpu/include/nvgpu/pmu/pmu_pg.h
index a2cf29728..0661a24da 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmu/pmu_pg.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmu/pmu_pg.h
@@ -61,6 +61,7 @@ struct pmu_pg_stats_data;
 
 struct nvgpu_pg_init {
 	bool state_change;
+	bool state_destroy;
 	struct nvgpu_cond wq;
 	struct nvgpu_thread state_task;
 };