diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
index d05cdb3f88..fe62f2e1fc 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
@@ -114,12 +114,6 @@ GpuAgent::GpuAgent(HSAuint32 node, const HsaNodeProperties& node_props)
   if (isa_base->IsSrameccSupported()) {
     sramecc = node_props.Capability.ui32.SRAM_EDCSupport == 1 ? core::IsaFeature::Enabled
                                                               : core::IsaFeature::Disabled;
-    // sramecc control for emulator.
-    if (core::Runtime::runtime_singleton_->flag().sramecc() != Flag::FLAG_DEFAULT) {
-      sramecc = core::Runtime::runtime_singleton_->flag().sramecc() == Flag::FLAG_ENABLE
-          ? core::IsaFeature::Enabled
-          : core::IsaFeature::Disabled;
-    }
   }
 
   rocr::core::IsaFeature xnack = rocr::core::IsaFeature::Unsupported;
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/util/flag.h b/projects/rocr-runtime/runtime/hsa-runtime/core/util/flag.h
index a5bd536148..6ea7651ac7 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/util/flag.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/util/flag.h
@@ -56,8 +56,6 @@ class Flag {
  public:
   enum SDMA_OVERRIDE { SDMA_DISABLE, SDMA_ENABLE, SDMA_DEFAULT };
 
-  enum FLAG_TRI_STATE { FLAG_DISABLE = 0, FLAG_ENABLE = 1, FLAG_DEFAULT = 2 };
-
   explicit Flag() { Refresh(); }
 
   virtual ~Flag() {}
@@ -138,11 +136,6 @@ class Flag {
 
     var = os::GetEnvVar("HSA_IGNORE_SRAMECC_MISREPORT");
     check_sramecc_validity_ = (var == "1") ? false : true;
-    
-    // Legal values are zero "0" or one "1". Any other value will
-    // be interpreted as not defining the env variable.
-    var = os::GetEnvVar("HSA_FORCE_SRAMECC");
-    sramecc_ = (var == "0") ? FLAG_DISABLE : ((var == "1") ? FLAG_ENABLE : FLAG_DEFAULT);
   }
 
   bool check_flat_scratch() const { return check_flat_scratch_; }
@@ -196,8 +189,6 @@ class Flag {
 
   bool check_sramecc_validity() const { return check_sramecc_validity_; }
 
-  FLAG_TRI_STATE sramecc() const { return sramecc_; }
-
  private:
   bool check_flat_scratch_;
   bool enable_vm_fault_message_;
@@ -231,9 +222,6 @@ class Flag {
 
   size_t force_sdma_size_;
 
-  // Indicates user preference for SramECC state.
-  FLAG_TRI_STATE sramecc_;
-
   DISALLOW_COPY_AND_ASSIGN(Flag);
 };