diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 73b03204747..864d36f0b77 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -1055,17 +1055,6 @@ static void r300_pick_vertex_shader(struct r300_context *r300)
     if (r300->vs_state.state) {
         bool wpos = r300_fs(r300)->shader->inputs.wpos != ATTR_UNUSED;
 
-        if (!vs->first) {
-            /* Build the vertex shader for the first time. */
-            vs->first = vs->shader = CALLOC_STRUCT(r300_vertex_shader_code);
-            vs->first->wpos = wpos;
-            r300_translate_vertex_shader(r300, vs);
-            if (!vs->first->dummy) {
-                r300_mark_vs_code_dirty(r300);
-                r300_mark_atom_dirty(r300, &r300->rs_block_state);
-            }
-            return;
-        }
         /* Pick the vertex shader based on whether we need wpos */
         if (vs->first->wpos != wpos) {
             if (vs->first->next && vs->first->next->wpos == wpos) {