diff --git a/src/gallium/drivers/radeonsi/si_state_binning.c b/src/gallium/drivers/radeonsi/si_state_binning.c
index 731950cd605..157a38f88a0 100644
--- a/src/gallium/drivers/radeonsi/si_state_binning.c
+++ b/src/gallium/drivers/radeonsi/si_state_binning.c
@@ -564,7 +564,8 @@ void si_emit_dpbb_state(struct si_context *sctx)
 		persistent_states_per_bin = 1;
 	} else {
 		context_states_per_bin = 6;
-		persistent_states_per_bin = 32;
+		/* Using 32 here can cause GPU hangs on RAVEN1 */
+		persistent_states_per_bin = 16;
 	}
 	fpovs_per_batch = 63;