diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c
index 28dea4f82b3..a364cff6aba 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup.c
@@ -622,7 +622,7 @@ lp_setup_bind_rasterizer( struct lp_setup_context *setup,
    setup->sprite_coord_origin = rast->sprite_coord_mode;
    setup->point_tri_clip = rast->point_size_per_vertex;
    setup->point_size_per_vertex = rast->point_size_per_vertex;
-   setup->legacy_points = !rast->point_quad_rasterization;
+   setup->legacy_points = !rast->point_quad_rasterization && !setup->multisample;
 }
 
 
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_point.c b/src/gallium/drivers/llvmpipe/lp_setup_point.c
index d07d3a40c46..c34c82c0ec6 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_point.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_point.c
@@ -372,7 +372,7 @@ try_setup_point( struct lp_setup_context *setup,
       print_point(setup, v0, size);
 
    /* Bounding rectangle (in pixels) */
-   if (!setup->legacy_points || setup->multisample) {
+   if (!setup->legacy_points) {
       /*
        * Rasterize points as quads.
        */
@@ -535,7 +535,7 @@ try_setup_point( struct lp_setup_context *setup,
       plane[3].c = MIN2(y[1], (bbox.y1 + 1) << 8);
       plane[3].eo = 0;
 
-      if (!setup->legacy_points || setup->multisample) {
+      if (!setup->legacy_points) {
          /* adjust for fill-rule*/
          plane[0].c++; /* left */
          if (setup->bottom_edge_rule == 0)