diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
index b2d6230dc..5d7ee84d9 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
@@ -796,6 +796,9 @@ static void gr_gp10b_remove_sysfs(struct device *dev)
 {
 	struct gk20a *g = get_gk20a(dev);
 
+	if (!g->ecc.gr.sm_lrf_single_err_count.counters)
+		return;
+
 	gr_gp10b_ecc_stat_remove(dev,
 			0,
 			&g->ecc.gr.sm_lrf_single_err_count,
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c
index 9f9d5ee14..df760478b 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c
@@ -502,6 +502,9 @@ static void gr_gv11b_remove_sysfs(struct device *dev)
 {
 	struct gk20a *g = get_gk20a(dev);
 
+	if (!g->ecc.gr.sm_l1_tag_corrected_err_count.counters)
+		return;
+
 	gr_gp10b_ecc_stat_remove(dev,
 			0,
 			&g->ecc.gr.sm_l1_tag_corrected_err_count,