diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 86f0dc11089..e82c9b3cc50 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -3178,7 +3178,8 @@ radv_pipeline_generate_binning_state(struct radeon_cmdbuf *ctx_cs,
 			fpovs_per_batch = 63;
 		} else {
 			context_states_per_bin = 6;
-			persistent_states_per_bin = 32;
+			/* 32 causes hangs for RAVEN. */
+			persistent_states_per_bin = 16;
 			fpovs_per_batch = 63;
 		}