diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 97f20355d59..3ffead9eb29 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -420,7 +420,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 		return 1;
 
 	case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT:
-		if (family >= CHIP_CEDAR && !is_nir_enabled(&rscreen->b))
+		if (family >= CHIP_CEDAR)
 			return 256;
 		return 0;
 
@@ -559,8 +559,7 @@ static int r600_get_shader_param(struct pipe_screen* pscreen,
       /* With NIR we currently disable TES, TCS and COMP shaders */
 	case PIPE_SHADER_TESS_CTRL:
 	case PIPE_SHADER_TESS_EVAL:
-		if (rscreen->b.family >= CHIP_CEDAR &&
-		    !is_nir_enabled(&rscreen->b))
+		if (rscreen->b.family >= CHIP_CEDAR)
 			break;
 	case PIPE_SHADER_COMPUTE:
 		if (!is_nir_enabled(&rscreen->b))