diff --git a/src/amd/vulkan/winsys/null/radv_null_winsys.c b/src/amd/vulkan/winsys/null/radv_null_winsys.c
index f3672a19662..81b62badb5d 100644
--- a/src/amd/vulkan/winsys/null/radv_null_winsys.c
+++ b/src/amd/vulkan/winsys/null/radv_null_winsys.c
@@ -123,7 +123,7 @@ radv_null_winsys_query_info(struct radeon_winsys *rws, struct radeon_info *gpu_i
    gpu_info->has_ngg_fully_culled_bug = gpu_info->gfx_level == GFX10;
    gpu_info->has_ngg_passthru_no_msg = gpu_info->family >= CHIP_NAVI23;
 
-   if (gpu_info->family == CHIP_NAVI31 || gpu_info->family == CHIP_NAVI32)
+   if (gpu_info->family == CHIP_NAVI31 || gpu_info->family == CHIP_NAVI32 || gpu_info->gfx_level >= GFX12)
       gpu_info->num_physical_wave64_vgprs_per_simd = 768;
    else if (gpu_info->gfx_level >= GFX10)
       gpu_info->num_physical_wave64_vgprs_per_simd = 512;