diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index b689f1d27cb..e5b70920307 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -1240,8 +1240,9 @@ setup_isel_context(Program* program,
       program->workgroup_size = program->wave_size;
    } else if (program->stage == compute_cs) {
       /* CS sets the workgroup size explicitly */
-      unsigned* bsize = program->info->cs.block_size;
-      program->workgroup_size = bsize[0] * bsize[1] * bsize[2];
+      program->workgroup_size = shaders[0]->info.cs.local_size[0] *
+                                shaders[0]->info.cs.local_size[1] *
+                                shaders[0]->info.cs.local_size[2];
    } else if ((program->stage & hw_es) || program->stage == geometry_gs) {
       /* Unmerged ESGS operate in workgroups if on-chip GS (LDS rings) are enabled on GFX7-8 (not implemented in Mesa)  */
       program->workgroup_size = program->wave_size;