diff --git a/drivers/gpu/nvgpu/common/gr/gr.c b/drivers/gpu/nvgpu/common/gr/gr.c
index 34da3b810..41446208c 100644
--- a/drivers/gpu/nvgpu/common/gr/gr.c
+++ b/drivers/gpu/nvgpu/common/gr/gr.c
@@ -406,11 +406,7 @@ static int nvgpu_gr_init_ctx_state(struct gk20a *g)
 {
 	int err = 0;
 
-	if ((g->gr->golden_image != NULL) &&
-		nvgpu_gr_obj_ctx_is_golden_image_ready(g->gr->golden_image)) {
-		return err;
-	}
-
+	/* Initialize ctx state during boot and recovery */
 	err = nvgpu_gr_falcon_init_ctx_state(g, g->gr->falcon);
 	if (err != 0) {
 		nvgpu_err(g, "gr ctx_state init failed");