diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index 7eff3c6cf0f1ffed587807871eb5583d5bafc404..18c8e5baa0116527698f06f8bbd37e32cab6d8fc 100644
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -993,8 +993,11 @@ static void cached_dev_write_complete(struct closure *cl)
 	struct search *s = container_of(cl, struct search, cl);
 	struct cached_dev *dc = container_of(s->d, struct cached_dev, disk);
 
+	if (!s->iop.bypass)
+		closure_call(&s->iop.cl, bch_data_insert, NULL, cl);
+
 	up_read_non_owner(&dc->writeback_lock);
-	cached_dev_bio_complete(cl);
+	continue_at(cl, cached_dev_bio_complete, NULL);
 }
 
 static void cached_dev_write(struct cached_dev *dc, struct search *s)
@@ -1077,7 +1080,8 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s)
 	}
 
 insert_data:
-	closure_call(&s->iop.cl, bch_data_insert, NULL, cl);
+	if (!s->iop.bypass)
+		closure_call(&s->iop.cl, bch_data_insert, NULL, cl);
 	continue_at(cl, cached_dev_write_complete, NULL);
 }