diff --git a/rocclr/runtime/device/gpu/gpuschedcl.cpp b/rocclr/runtime/device/gpu/gpuschedcl.cpp
index 1c0fc38269..5f4935b2be 100644
--- a/rocclr/runtime/device/gpu/gpuschedcl.cpp
+++ b/rocclr/runtime/device/gpu/gpuschedcl.cpp
@@ -205,8 +205,7 @@ void RunCmdTemplateDispatch(
     uint    flags = kernelObj->kernel_code_properties;
     uint    privateSize = kernelObj->workitem_private_segment_byte_size;
 
-    uint ldsSize = aqlPkt->group_segment_size_bytes +
-        kernelObj->workgroup_group_segment_byte_size;
+    uint ldsSize = aqlPkt->group_segment_size_bytes;
 
     // Align up the LDS blocks 128 * 4(in DWORDs)
     uint ldsBlocks = (ldsSize + 511) >> 9;
diff --git a/rocclr/runtime/device/pal/palkernel.cpp b/rocclr/runtime/device/pal/palkernel.cpp
index c593b98c99..3d4643621e 100644
--- a/rocclr/runtime/device/pal/palkernel.cpp
+++ b/rocclr/runtime/device/pal/palkernel.cpp
@@ -357,7 +357,7 @@ hsa_kernel_dispatch_packet_t* HSAILKernel::loadArguments(
 
   // Initialize kernel ISA and execution buffer requirements
   hsaDisp->private_segment_size = spillSegSize();
-  hsaDisp->group_segment_size = ldsAddress - ldsSize();
+  hsaDisp->group_segment_size = ldsAddress;
   hsaDisp->kernel_object = gpuAqlCode();
 
   hsaDisp->kernarg_address = reinterpret_cast<void*>(argList);