diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c
index 80a0094be356..553cfd7ebc21 100644
--- a/fs/bcachefs/btree_io.c
+++ b/fs/bcachefs/btree_io.c
@@ -1187,7 +1187,7 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca,
                             le64_to_cpu(i->journal_seq),
                             b->written, b->written + sectors, ptr_written);
 
-               b->written += sectors;
+               b->written = min(b->written + sectors, btree_sectors(c));
 
                if (blacklisted && !first)
                        continue;
@@ -1195,8 +1195,8 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca,
                sort_iter_add(iter,
                              vstruct_idx(i, 0),
                              vstruct_last(i));
-
-               max_journal_seq = max(max_journal_seq, le64_to_cpu(i->journal_seq));
+               if (likely(i->u64s))
+                       max_journal_seq = max(max_journal_seq, le64_to_cpu(i->journal_seq));
        }
 
        if (ptr_written) {