diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs
index 54170c5e5..679c177dc 100644
--- a/drivers/gpu/nvgpu/Makefile.shared.configs
+++ b/drivers/gpu/nvgpu/Makefile.shared.configs
@@ -108,8 +108,6 @@ NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_SYSFS
 
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_FALCON_DEBUG
 
-NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_INJECT_HWERR
-
 #
 # Flags enabled only for regular build profile.
 #
@@ -200,6 +198,9 @@ NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_FIFO_ENGINE_ACTIVITY
 CONFIG_NVGPU_DYNAMIC_BUSY_IDLE_SUPPORT := 1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_DYNAMIC_BUSY_IDLE_SUPPORT
 
+# Enable HW based error injection support
+NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_INJECT_HWERR
+
 endif
 endif