diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 5dac72e5b..92b43c8a1 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -1903,6 +1903,7 @@ static void gk20a_channel_clean_up_jobs(struct work_struct *work)
 	platform = gk20a_get_platform(g->dev);
 
 	gk20a_channel_cancel_job_clean_up(c, false);
+	gk20a_channel_timeout_stop(c);
 
 	while (1) {
 		bool completed;