diff --git a/src/amd/common/ac_perfcounter.c b/src/amd/common/ac_perfcounter.c
index 4c9b0c5f1cc..a52a0f0a192 100644
--- a/src/amd/common/ac_perfcounter.c
+++ b/src/amd/common/ac_perfcounter.c
@@ -755,10 +755,11 @@ bool ac_init_perfcounters(const struct radeon_info *info,
          const uint32_t rb_per_sa = num_rb_per_se / info->max_sa_per_se;
 
          /* Determine the number of 16-bit/32-bit SPM counters. */
-         if (!block->b->b->num_16bit_spm_counters)
+         if (!block->b->b->num_16bit_spm_counters &&
+             !block->b->b->num_32bit_spm_counters) {
             block->b->b->num_16bit_spm_counters = block->b->b->num_spm_counters * 4;
-         if (!block->b->b->num_32bit_spm_counters)
             block->b->b->num_32bit_spm_counters = block->b->b->num_spm_counters * 2;
+         }
 
          switch (block->b->b->gpu_block) {
          case CB: