diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index d34059f0e61..cef0c65e478 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -562,12 +562,8 @@ prepare_wm_surfaces(struct brw_context *brw)
 	 struct intel_renderbuffer *irb = intel_renderbuffer(rb);
 	 struct intel_region *region = irb ? irb->region : NULL;
 
-	 if (region == NULL || region->buffer == NULL) {
-	    brw->intel.Fallback = GL_TRUE; /* boolean, not bitfield */
-	    return;
-	 }
-
-	 brw_add_validated_bo(brw, region->buffer);
+	 if (region)
+	    brw_add_validated_bo(brw, region->buffer);
 	 nr_surfaces = SURF_INDEX_DRAW(i) + 1;
       }
    }
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
index ff220255311..361db2fead8 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
@@ -329,12 +329,8 @@ prepare_wm_surfaces(struct brw_context *brw)
 	 struct intel_renderbuffer *irb = intel_renderbuffer(rb);
 	 struct intel_region *region = irb ? irb->region : NULL;
 
-	 if (region == NULL || region->buffer == NULL) {
-	    brw->intel.Fallback = GL_TRUE; /* boolean, not bitfield */
-	    return;
-	 }
-
-	 brw_add_validated_bo(brw, region->buffer);
+	 if (region)
+	    brw_add_validated_bo(brw, region->buffer);
 	 nr_surfaces = SURF_INDEX_DRAW(i) + 1;
       }
    }