diff --git a/substrate/tendermint/client/src/validators.rs b/substrate/tendermint/client/src/validators.rs
index 87e1b016..9ecd3db8 100644
--- a/substrate/tendermint/client/src/validators.rs
+++ b/substrate/tendermint/client/src/validators.rs
@@ -178,6 +178,9 @@ where
 
   // TODO
   fn proposer(&self, number: BlockNumber, round: Round) -> u16 {
-    u16::try_from(number.0 + u64::from(round.0)).unwrap()
+    u16::try_from(
+      (number.0 + u64::from(round.0)) % u64::try_from(self.0.read().unwrap().lookup.len()).unwrap(),
+    )
+    .unwrap()
   }
 }