diff --git a/substrate/tendermint/client/src/authority/mod.rs b/substrate/tendermint/client/src/authority/mod.rs
index c4907802..e7fb97d0 100644
--- a/substrate/tendermint/client/src/authority/mod.rs
+++ b/substrate/tendermint/client/src/authority/mod.rs
@@ -72,10 +72,10 @@ impl<T: TendermintValidator> TendermintAuthority<T> {
     let info = self.import.client.info();
 
     (
-      info.best_hash,
+      info.finalized_hash,
       (
         // Header::Number: TryInto<u64> doesn't implement Debug and can't be unwrapped
-        match info.best_number.try_into() {
+        match info.finalized_number.try_into() {
           Ok(best) => BlockNumber(best),
           Err(_) => panic!("BlockNumber exceeded u64"),
         },
@@ -85,7 +85,7 @@ impl<T: TendermintValidator> TendermintAuthority<T> {
           &mut self
             .import
             .client
-            .justifications(&BlockId::Hash(info.best_hash))
+            .justifications(&BlockId::Hash(info.finalized_hash))
             .unwrap()
             .map(|justifications| justifications.get(CONSENSUS_ID).cloned().unwrap())
             .unwrap_or_default()
diff --git a/substrate/tendermint/client/src/tendermint.rs b/substrate/tendermint/client/src/tendermint.rs
index 5fddd5bb..d184d8fd 100644
--- a/substrate/tendermint/client/src/tendermint.rs
+++ b/substrate/tendermint/client/src/tendermint.rs
@@ -78,7 +78,7 @@ impl<T: TendermintValidator> TendermintImport<T> {
     number: <<T::Block as Block>::Header as Header>::Number,
   ) -> Result<(), Error> {
     let info = self.client.info();
-    if (info.best_hash != parent) || ((info.best_number + 1u16.into()) != number) {
+    if (info.finalized_hash != parent) || ((info.finalized_number + 1u16.into()) != number) {
       Err(Error::Other("non-sequential import".into()))?;
     }
     Ok(())
diff --git a/substrate/tendermint/client/src/validators.rs b/substrate/tendermint/client/src/validators.rs
index 046a2738..177e7425 100644
--- a/substrate/tendermint/client/src/validators.rs
+++ b/substrate/tendermint/client/src/validators.rs
@@ -29,7 +29,7 @@ struct TendermintValidatorsStruct {
 
 impl TendermintValidatorsStruct {
   fn from_module<T: TendermintClient>(client: &Arc<T::Client>) -> TendermintValidatorsStruct {
-    let last = client.info().best_hash;
+    let last = client.info().finalized_hash;
     let api = client.runtime_api();
     let session = api.current_session(&BlockId::Hash(last)).unwrap();
     let validators = api.validators(&BlockId::Hash(last)).unwrap();
@@ -63,7 +63,7 @@ impl<T: TendermintClient> Refresh<T> {
       self
         .client
         .runtime_api()
-        .current_session(&BlockId::Hash(self.client.info().best_hash))
+        .current_session(&BlockId::Hash(self.client.info().finalized_hash))
         .unwrap()
     {
       *self._refresh.write().unwrap() = TendermintValidatorsStruct::from_module::<T>(&self.client);