diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index a00499a98..c4bfe527c 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -2011,10 +2011,6 @@ int gk20a_init_pmu_setup_hw2(struct gk20a *g)
 	gk20a_writel(g, 0x10a164, 0x109ff);
 
 	pmu->initialized = true;
-	pmu->zbc_ready = true;
-
-	/* Save zbc table after PMU is initialized. */
-	pmu_save_zbc(g, 0xf);
 
 	/*
 	 * We can't guarantee that gr code to enable ELPG will be
@@ -2023,6 +2019,10 @@ int gk20a_init_pmu_setup_hw2(struct gk20a *g)
 	 */
 	gk20a_pmu_disable_elpg(g);
 
+	pmu->zbc_ready = true;
+	/* Save zbc table after PMU is initialized. */
+	pmu_save_zbc(g, 0xf);
+
 	if (g->elpg_enabled)
 		gk20a_pmu_enable_elpg(g);