diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuscsi.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuscsi.cpp
index 5de3a41013..5f5e548b84 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpuscsi.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpuscsi.cpp
@@ -165,13 +165,11 @@ HSAILKernel::aqlCreateHWInfo(const void* shader, size_t shaderSize)
 
     char* headerBaseAddress =
         reinterpret_cast<char*>(siMetaData->common.hShaderMemHandle);
-    hsa_ext_code_descriptor_t* hcd =
-        reinterpret_cast<hsa_ext_code_descriptor_t*>(headerBaseAddress);
     amd_kernel_code_t* akc = reinterpret_cast<amd_kernel_code_t*>(
-        headerBaseAddress + hcd->code.handle);
+        headerBaseAddress);
 
     address codeStartAddress = reinterpret_cast<address>(akc);
-    address codeEndAddress = reinterpret_cast<address>(hcd) + siMetaData->common.codeLenInByte;
+    address codeEndAddress = reinterpret_cast<address>(akc) + siMetaData->common.codeLenInByte;
     codeSize_ = codeEndAddress - codeStartAddress;
     code_ = new gpu::Memory(dev(), amd::alignUp(codeSize_, gpu::ConstBuffer::VectorSize));