diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 1d21e1267bc..afe1dd1eae2 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -531,13 +531,8 @@ st_translate_vertex_program(struct st_context *st,
                                                   MESA_SHADER_VERTEX);
          stp->Base.info = stp->Base.nir->info;
 
-         /* For st_draw_feedback, we need to generate TGSI too if draw doesn't
-          * use LLVM.
-          */
-         if (draw_has_llvm()) {
-            st_prepare_vertex_program(stp);
-            return true;
-         }
+         st_prepare_vertex_program(stp);
+         return true;
       }
    }
 
@@ -713,8 +708,7 @@ st_create_vp_variant(struct st_context *st,
 
    state.stream_output = stvp->state.stream_output;
 
-   if (stvp->state.type == PIPE_SHADER_IR_NIR &&
-       (!key->is_draw_shader || draw_has_llvm())) {
+   if (stvp->state.type == PIPE_SHADER_IR_NIR) {
       bool finalize = false;
 
       state.type = PIPE_SHADER_IR_NIR;