diff --git a/src/mesa/state_tracker/st_draw_hw_select.c b/src/mesa/state_tracker/st_draw_hw_select.c
index dd42c0e5cd8..bcf757b0938 100644
--- a/src/mesa/state_tracker/st_draw_hw_select.c
+++ b/src/mesa/state_tracker/st_draw_hw_select.c
@@ -647,7 +647,8 @@ hw_select_create_gs(struct st_context *st, union state_key state)
       UNREACHABLE("unexpected primitive");
    }
 
-   nir_lower_returns(nir);
+   NIR_PASS(_, nir, nir_lower_returns);
+   NIR_PASS(_, nir, nir_opt_intrinsics);
 
    return st_nir_finish_builtin_shader(st, nir);
 }