diff --git a/drivers/gpu/nvgpu/common/init/nvgpu_init.c b/drivers/gpu/nvgpu/common/init/nvgpu_init.c
index d52e298a9..63f97f07f 100644
--- a/drivers/gpu/nvgpu/common/init/nvgpu_init.c
+++ b/drivers/gpu/nvgpu/common/init/nvgpu_init.c
@@ -542,6 +542,8 @@ static void gk20a_free_cb(struct nvgpu_ref *refcount)
 
 	gk20a_ce_destroy(g);
 
+	nvgpu_cbc_remove_support(g);
+
 	if (g->remove_support != NULL) {
 		g->remove_support(g);
 	}
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index cd1d5cc02..315e68833 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -38,7 +38,6 @@
 #include <nvgpu/netlist.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/ecc.h>
-#include <nvgpu/cbc.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/fifo.h>
@@ -2110,8 +2109,6 @@ static void gk20a_remove_gr_support(struct gr_gk20a *gr)
 
 	nvgpu_gr_hwpm_map_deinit(g, gr->hwpm_map);
 
-	nvgpu_cbc_remove_support(g);
-
 	nvgpu_ecc_remove_support(g);
 	nvgpu_gr_zbc_deinit(g, gr->zbc);
 }