diff --git a/src/gallium/drivers/crocus/crocus_program.c b/src/gallium/drivers/crocus/crocus_program.c
index 8b2cd2deb79..b236a267a61 100644
--- a/src/gallium/drivers/crocus/crocus_program.c
+++ b/src/gallium/drivers/crocus/crocus_program.c
@@ -1977,7 +1977,7 @@ crocus_update_compiled_fs(struct crocus_context *ice)
       if (devinfo->ver < 6)
          ice->state.dirty |= CROCUS_DIRTY_GEN4_CLIP_PROG | CROCUS_DIRTY_GEN4_SF_PROG;
       else
-         ice->state.dirty |= CROCUS_DIRTY_CLIP;
+         ice->state.dirty |= CROCUS_DIRTY_CLIP | CROCUS_DIRTY_GEN6_BLEND_STATE;
       if (devinfo->ver == 6)
          ice->state.dirty |= CROCUS_DIRTY_RASTER;
       if (devinfo->ver >= 7)
diff --git a/src/gallium/drivers/crocus/crocus_state.c b/src/gallium/drivers/crocus/crocus_state.c
index 8cb00a98fa1..b39b5232d12 100644
--- a/src/gallium/drivers/crocus/crocus_state.c
+++ b/src/gallium/drivers/crocus/crocus_state.c
@@ -3379,10 +3379,8 @@ crocus_set_framebuffer_state(struct pipe_context *ctx,
    }
 #endif
 
-#if GFX_VER >= 6
-   if (cso->nr_cbufs != state->nr_cbufs) {
-      ice->state.dirty |= CROCUS_DIRTY_GEN6_BLEND_STATE;
-   }
+#if GFX_VER >= 6 && GFX_VER < 8
+   ice->state.dirty |= CROCUS_DIRTY_GEN6_BLEND_STATE;
 #endif
 
    if ((cso->layers == 0) != (layers == 0)) {