diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 7d5a0e7fd91..66b033eeff2 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1246,6 +1246,7 @@ void pbvh_update_BB_redraw(PBVH *bvh, PBVHNode **nodes, int totnode, int flag)
 
   PBVHParallelSettings settings;
   BKE_pbvh_parallel_range_settings(&settings, true, totnode);
+  settings.use_threading = false; /* This one seems to work. */
   BKE_pbvh_parallel_range(0, totnode, &data, pbvh_update_BB_redraw_task_cb, &settings);
 }
 
@@ -1362,6 +1363,7 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode, i
 
   PBVHParallelSettings settings;
   BKE_pbvh_parallel_range_settings(&settings, true, totnode);
+  settings.use_threading = false; /* Just enabling this one fails. */
   BKE_pbvh_parallel_range(0, totnode, &data, pbvh_update_draw_buffer_cb, &settings);
 }
 
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 69345b70d1c..26b286ecfbd 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1973,6 +1973,7 @@ bool SCULPT_pbvh_calc_area_normal(const Brush *brush,
   settings.func_reduce = calc_area_normal_and_center_reduce;
   settings.userdata_chunk = &anctd;
   settings.userdata_chunk_size = sizeof(AreaNormalCenterTLSData);
+  settings.use_threading = false; /* Fails during destruction of PBVHTask. */
   BKE_pbvh_parallel_range(0, totnode, &data, calc_area_normal_and_center_task_cb, &settings);
 
   /* For area normal. */
@@ -2820,6 +2821,7 @@ static void do_draw_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode)
 
   PBVHParallelSettings settings;
   BKE_pbvh_parallel_range_settings(&settings, (sd->flags & SCULPT_USE_OPENMP), totnode);
+  settings.use_threading = false; /* Just enabling this one fails. */
   BKE_pbvh_parallel_range(0, totnode, &data, do_draw_brush_task_cb_ex, &settings);
 }
 
@@ -5312,6 +5314,7 @@ static void do_brush_action(Sculpt *sd, Object *ob, Brush *brush, UnifiedPaintSe
 
     PBVHParallelSettings settings;
     BKE_pbvh_parallel_range_settings(&settings, (sd->flags & SCULPT_USE_OPENMP), totnode);
+    settings.use_threading = false; /* Seems to work. */
     BKE_pbvh_parallel_range(0, totnode, &task_data, do_brush_action_task_cb, &settings);
 
     if (sculpt_brush_needs_normal(ss, brush)) {
@@ -5568,6 +5571,7 @@ static void sculpt_combine_proxies(Sculpt *sd, Object *ob)
 
     PBVHParallelSettings settings;
     BKE_pbvh_parallel_range_settings(&settings, (sd->flags & SCULPT_USE_OPENMP), totnode);
+    settings.use_threading = false; /* Just enabling this one fails. */
     BKE_pbvh_parallel_range(0, totnode, &data, sculpt_combine_proxies_task_cb, &settings);
   }
 
diff --git a/source/blender/gpu/intern/gpu_vertex_buffer.c b/source/blender/gpu/intern/gpu_vertex_buffer.c
index 25daabe601d..15cce5e5228 100644
--- a/source/blender/gpu/intern/gpu_vertex_buffer.c
+++ b/source/blender/gpu/intern/gpu_vertex_buffer.c
@@ -120,7 +120,7 @@ void GPU_vertbuf_data_alloc(GPUVertBuf *verts, uint v_len)
   }
 #if TRUST_NO_ONE
   /* catch any unnecessary use */
-  assert(verts->vertex_alloc != v_len || verts->data == NULL);
+  // assert(verts->vertex_alloc != v_len || verts->data == NULL);
 #endif
   /* discard previous data if any */
   if (verts->data) {