diff --git a/rocclr/device/devprogram.cpp b/rocclr/device/devprogram.cpp
index f0ed019daf..68c97dd15e 100644
--- a/rocclr/device/devprogram.cpp
+++ b/rocclr/device/devprogram.cpp
@@ -1967,6 +1967,8 @@ std::vector<std::string> Program::ProcessOptions(amd::option::Options* options)
         opts << "-D"
           << "CL_DEVICE_MAX_GLOBAL_VARIABLE_SIZE=" << device().info().maxGlobalVariableSize_;
         optionsVec.push_back(opts.str());
+      } else {
+        options->oVariables->UniformWorkGroupSize = true;
       }
 
     if (!device().settings().useLightning_) {