diff --git a/crates/core/src/db/datastore/locking_tx_datastore/tx.rs b/crates/core/src/db/datastore/locking_tx_datastore/tx.rs
index 2d76f43151..3d1f01f041 100644
--- a/crates/core/src/db/datastore/locking_tx_datastore/tx.rs
+++ b/crates/core/src/db/datastore/locking_tx_datastore/tx.rs
@@ -81,7 +81,7 @@ impl TxId {
         self.committed_state_shared_lock.get_table(table_id).and_then(|t| {
             t.indexes
                 .get(cols)
-                .map(|index| NonZeroU64::new(index.num_keys() as u64))
+                .and_then(|index| NonZeroU64::new(index.num_keys() as u64))
         })
     }
 }