diff --git a/repair/row_level.cc b/repair/row_level.cc
index 37474360eb..e01f783e6f 100644
--- a/repair/row_level.cc
+++ b/repair/row_level.cc
@@ -380,10 +380,12 @@ public:
         auto get_next_mutation_fragment = [this, node_idx] () mutable {
             return _mq[node_idx]->pop_eventually();
         };
-        table& t = service::get_local_storage_service().db().local().find_column_family(_schema->id());
+        auto& db = service::get_local_storage_service().db();
+        table& t = db.local().find_column_family(_schema->id());
         _writer_done[node_idx] = distribute_reader_and_consume_on_shards(_schema, dht::global_partitioner(),
                 make_generating_reader(_schema, std::move(get_next_mutation_fragment)),
-                [&t, estimated_partitions = this->_estimated_partitions] (flat_mutation_reader reader) {
+                [&db, estimated_partitions = this->_estimated_partitions] (flat_mutation_reader reader) {
+            auto& t = db.local().find_column_family(reader.schema());
             return db::view::check_needs_view_update_path(_sys_dist_ks->local(), t, streaming::stream_reason::repair).then([t = t.shared_from_this(), estimated_partitions, reader = std::move(reader)] (bool use_view_update_path) mutable {
                 sstables::shared_sstable sst = use_view_update_path ? t->make_streaming_staging_sstable() : t->make_streaming_sstable_for_write();
                 schema_ptr s = reader.schema();
diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc
index 337e9e42c6..08435b9580 100644
--- a/streaming/stream_session.cc
+++ b/streaming/stream_session.cc
@@ -183,7 +183,8 @@ void stream_session::init_messaging_service_handler() {
                     };
                     distribute_reader_and_consume_on_shards(s, dht::global_partitioner(),
                         make_generating_reader(s, std::move(get_next_mutation_fragment)),
-                        [&cf, plan_id, estimated_partitions, reason] (flat_mutation_reader reader) {
+                        [plan_id, estimated_partitions, reason] (flat_mutation_reader reader) {
+                            auto& cf = get_local_db().find_column_family(reader.schema());
                             return db::view::check_needs_view_update_path(_sys_dist_ks->local(), cf, reason).then([cf = cf.shared_from_this(), estimated_partitions, reader = std::move(reader)] (bool use_view_update_path) mutable {
                                 sstables::shared_sstable sst = use_view_update_path ? cf->make_streaming_staging_sstable() : cf->make_streaming_sstable_for_write();
                                 schema_ptr s = reader.schema();