diff --git a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c
index c9927815f..87fb31e24 100644
--- a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c
+++ b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c
@@ -1158,6 +1158,9 @@ int vgpu_ga10b_init_hal(struct gk20a *g)
 
 	if (!priv->constants.can_set_clkrate) {
 		gops->clk_arb.get_arbiter_clk_domains = NULL;
+		nvgpu_set_enabled(g, NVGPU_CLK_ARB_ENABLED, false);
+	} else {
+		nvgpu_set_enabled(g, NVGPU_CLK_ARB_ENABLED, true);
 	}
 
 	if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)){
diff --git a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c
index dae2501c3..18900048e 100644
--- a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c
@@ -1135,6 +1135,8 @@ int vgpu_gv11b_init_hal(struct gk20a *g)
 	if (!priv->constants.can_set_clkrate) {
 		gops->clk_arb.get_arbiter_clk_domains = NULL;
 		nvgpu_set_enabled(g, NVGPU_CLK_ARB_ENABLED, false);
+	} else {
+		nvgpu_set_enabled(g, NVGPU_CLK_ARB_ENABLED, true);
 	}
 
 #ifdef CONFIG_NVGPU_SM_DIVERSITY
@@ -1179,7 +1181,6 @@ int vgpu_gv11b_init_hal(struct gk20a *g)
 #ifdef CONFIG_NVGPU_RECOVERY
 	nvgpu_set_enabled(g, NVGPU_SUPPORT_FAULT_RECOVERY, true);
 #endif
-	nvgpu_set_enabled(g, NVGPU_CLK_ARB_ENABLED, true);
 
 	g->name = "gv11b";