diff --git a/storage-bigtable/src/bigtable.rs b/storage-bigtable/src/bigtable.rs
index b988ade47fcfe2..96831c6421f4b6 100644
--- a/storage-bigtable/src/bigtable.rs
+++ b/storage-bigtable/src/bigtable.rs
@@ -446,7 +446,7 @@ impl BigTable {
         T: serde::de::DeserializeOwned,
     {
         let row_data = self.get_row_data(table, Some(key.clone()), None, 1).await?;
-        let (row_key, data) = &row_data[0];
+        let (row_key, data) = &row_data.get(0).ok_or_else(|| Error::RowNotFound)?;
 
         deserialize_cell_data(data, table, row_key.to_string())
     }