diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
index d403e81c224..d9a5862e442 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
@@ -722,6 +722,10 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle,
          }
       }
    }
+
+   /* stream output needs to be done before clipping */
+   draw_pt_so_emit( fpme->so_emit, gshader ? gshader->num_vertex_streams : 1, vert_info, prim_info );
+
    if (prim_info->count == 0) {
       debug_printf("GS/IA didn't emit any vertices!\n");
 
@@ -733,9 +737,6 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle,
       return;
    }
 
-   /* stream output needs to be done before clipping */
-   draw_pt_so_emit( fpme->so_emit, gshader ? gshader->num_vertex_streams : 1, vert_info, prim_info );
-
    draw_stats_clipper_primitives(draw, prim_info);
 
    /*