1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
index 20a40329d84a..7a75b5010f73 100644
--- a/drivers/md/persistent-data/dm-btree.c
+++ b/drivers/md/persistent-data/dm-btree.c
@@ -897,8 +897,12 @@ static int find_key(struct ro_spine *s, dm_block_t block, bool find_highest,
                 else
                         *result_key = le64_to_cpu(ro_node(s)->keys[0]);
 
-                if (next_block || flags & INTERNAL_NODE)
-                        block = value64(ro_node(s), i);
+                if (next_block || flags & INTERNAL_NODE) {
+                        if (find_highest)
+                                block = value64(ro_node(s), i);
+                        else
+                                block = value64(ro_node(s), 0);
+                }
 
         } while (flags & INTERNAL_NODE);