diff --git a/matrix_sdk_base/src/store/sled_store/mod.rs b/matrix_sdk_base/src/store/sled_store/mod.rs
index 8f474d60..a5451444 100644
--- a/matrix_sdk_base/src/store/sled_store/mod.rs
+++ b/matrix_sdk_base/src/store/sled_store/mod.rs
@@ -161,11 +161,7 @@ impl EncodeKey for EventType {
 pub fn decode_key_value(key: &[u8], position: usize) -> Option<String> {
     let values: Vec<&[u8]> = key.split(|v| *v == ENCODE_SEPARATOR).collect();
 
-    if position >= values.len() {
-        return None;
-    }
-
-    Some(String::from_utf8_lossy(values[position]).to_string())
+    values.get(position).map(|s| String::from_utf8_lossy(s).to_string())
 }
 
 #[derive(Clone)]