diff --git a/tikv-client-common/src/kv/bound_range.rs b/tikv-client-common/src/kv/bound_range.rs
index 3ffe533..deef68f 100644
--- a/tikv-client-common/src/kv/bound_range.rs
+++ b/tikv-client-common/src/kv/bound_range.rs
@@ -189,8 +189,7 @@ impl Into<kvrpcpb::KeyRange> for BoundRange {
         let (start, end) = self.into_keys();
         let mut range = kvrpcpb::KeyRange::default();
         range.set_start_key(start.into());
-        // FIXME handle end = None rather than unwrapping
-        end.map(|k| range.set_end_key(k.into())).unwrap();
+        range.set_end_key(end.unwrap_or_default().into());
         range
     }
 }