diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs
index 1fbb4dbfb..778ca21dd 100644
--- a/drivers/gpu/nvgpu/Makefile.shared.configs
+++ b/drivers/gpu/nvgpu/Makefile.shared.configs
@@ -64,10 +64,6 @@ NVGPU_COMMON_CFLAGS		+=		\
 CONFIG_NVGPU_LOGGING                 := 1
 NVGPU_COMMON_CFLAGS                  += -DCONFIG_NVGPU_LOGGING
 
-# Enable recovery for safety build until sw quiesce is done
-CONFIG_NVGPU_RECOVERY           := 1
-NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_RECOVERY
-
 ifeq ($(profile),$(filter $(profile),safety_debug safety_release))
 
 # Enable golden context verification only for safety debug/release build
@@ -103,6 +99,9 @@ NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_ENGINE_QUEUE
 CONFIG_NVGPU_DEBUGGER           := 1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_DEBUGGER
 
+CONFIG_NVGPU_RECOVERY           := 1
+NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_RECOVERY
+
 CONFIG_NVGPU_CILP               := 1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_CILP