diff --git a/projects/clr/rocclr/device/devkernel.cpp b/projects/clr/rocclr/device/devkernel.cpp
index fdd20a0e37..f3d6e71762 100644
--- a/projects/clr/rocclr/device/devkernel.cpp
+++ b/projects/clr/rocclr/device/devkernel.cpp
@@ -570,7 +570,7 @@ static amd_comgr_status_t populateKernelMetaV3(const amd_comgr_metadata_node_t k
       kernel->SetWGPMode(buf.compare("true") == 0);
       break;
     case KernelField::UniformWrokGroupSize:
-      kernel->setUniformWorkGroupSize(buf.compare("true") == 0);
+      kernel->setUniformWorkGroupSize(buf.compare("1") == 0);
       break;
     default:
       return AMD_COMGR_STATUS_ERROR;
diff --git a/projects/clr/rocclr/device/pal/palprogram.cpp b/projects/clr/rocclr/device/pal/palprogram.cpp
index cbd517eea8..fb5ed4e141 100644
--- a/projects/clr/rocclr/device/pal/palprogram.cpp
+++ b/projects/clr/rocclr/device/pal/palprogram.cpp
@@ -748,8 +748,9 @@ bool LightningProgram::createKernels(void* binary, size_t binSize, bool useUnifo
       return false;
     }
     kernels()[kernelName] = kernel;
-
-    kernel->setUniformWorkGroupSize(useUniformWorkGroupSize);
+    if (codeObjectVer() < 5) {
+      kernel->setUniformWorkGroupSize(useUniformWorkGroupSize);
+    }
   }
 
   executable_ = loader_->CreateExecutable(HSA_PROFILE_FULL, nullptr);
diff --git a/projects/clr/rocclr/device/rocm/rocprogram.cpp b/projects/clr/rocclr/device/rocm/rocprogram.cpp
index 4f77026d6a..580803fdeb 100644
--- a/projects/clr/rocclr/device/rocm/rocprogram.cpp
+++ b/projects/clr/rocclr/device/rocm/rocprogram.cpp
@@ -274,7 +274,9 @@ bool LightningProgram::createKernels(void* binary, size_t binSize, bool useUnifo
     if (!aKernel->init()) {
       return false;
     }
-    aKernel->setUniformWorkGroupSize(useUniformWorkGroupSize);
+    if (codeObjectVer() < 5) {
+      aKernel->setUniformWorkGroupSize(useUniformWorkGroupSize);
+    }
     aKernel->setInternalKernelFlag(internalKernel);
     kernels()[kernelName] = aKernel;
   }