diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index f77ad10b6..9d52c943f 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -1915,6 +1915,9 @@ int gk20a_init_pmu_setup_sw(struct gk20a *g)
 
 	gk20a_dbg_fn("");
 
+	/* start with elpg disabled until first enable call */
+	pmu->elpg_refcnt = 0;
+
 	if (pmu->sw_ready) {
 		for (i = 0; i < pmu->mutex_cnt; i++) {
 			pmu->mutex[i].id    = i;
@@ -2478,9 +2481,6 @@ static int pmu_init_powergating(struct pmu_gk20a *pmu)
 	gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ,
 			pmu_handle_pg_elpg_msg, pmu, &seq, ~0);
 
-	/* start with elpg disabled until first enable call */
-	pmu->elpg_refcnt = 0;
-
 	pmu->pmu_state = PMU_STATE_ELPG_BOOTING;
 
 	return 0;