diff --git a/drivers/gpu/nvgpu/common/fifo/submit.c b/drivers/gpu/nvgpu/common/fifo/submit.c
index 870d0f4d2..7eea43dcf 100644
--- a/drivers/gpu/nvgpu/common/fifo/submit.c
+++ b/drivers/gpu/nvgpu/common/fifo/submit.c
@@ -591,8 +591,10 @@ clean_up:
 	nvgpu_fence_put(post_fence);
 	if (c->deterministic) {
 		nvgpu_rwsem_up_read(&g->deterministic_busy);
-	} else if (need_deferred_cleanup) {
-		gk20a_idle(g);
+	} else {
+		if (need_deferred_cleanup) {
+			gk20a_idle(g);
+		}
 	}
 
 	return err;