diff --git a/rocclr/device/device.hpp b/rocclr/device/device.hpp
index 5b7823c245..5c2798ad76 100644
--- a/rocclr/device/device.hpp
+++ b/rocclr/device/device.hpp
@@ -1698,7 +1698,7 @@ class Device : public RuntimeObject {
   // Max Scratch size is based on ISA and thus per device.
   // Def value is as per GFX9 being the least among supported devices.
   size_t maxStackSize_ = kMaxStackSize9X;
-  static bool device_not_usable_; //!< If set, we should not launch any commands anymore.
+  static cl_int gpu_error_; //!< Store the GPU error cause during kernel launch
 
   typedef std::list<CommandQueue*> CommandQueues;
 
@@ -2224,7 +2224,6 @@ class Device : public RuntimeObject {
   uint64_t initial_heap_size_{HIP_INITIAL_DM_SIZE};  //!< Initial device heap size
   amd::Monitor activeQueuesLock_ {}; //!< Guards access to the activeQueues set
   std::unordered_set<amd::CommandQueue*> activeQueues; //!< The set of active queues
-  static cl_int gpu_error_; //!< Store the GPU error cause during kernel launch
 
  private:
   const Isa *isa_;                //!< Device isa