diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index b6347681fc1..7029cd32c12 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -4133,8 +4133,8 @@ static void evergreen_set_shader_buffers(struct pipe_context *ctx,
 	unsigned i, idx;
 	unsigned old_mask;
 
-	if (shader != PIPE_SHADER_FRAGMENT &&
-	    shader != PIPE_SHADER_COMPUTE && count == 0)
+	if ((shader != PIPE_SHADER_FRAGMENT &&
+        shader != PIPE_SHADER_COMPUTE) || count == 0)
 		return;
 
 	if (shader == PIPE_SHADER_FRAGMENT)