diff --git a/core/src/consensus/tendermint/worker.rs b/core/src/consensus/tendermint/worker.rs
index 78df782f68..a71b069ac0 100644
--- a/core/src/consensus/tendermint/worker.rs
+++ b/core/src/consensus/tendermint/worker.rs
@@ -1232,8 +1232,15 @@ impl Worker {
                 TendermintState::ProposeWaitEmptyBlockTimer {
                     block,
                 } => {
-                    cdebug!(ENGINE, "Empty proposal timer is finished, go to the prevote step and broadcast the block");
-                    self.submit_proposal_block(block.as_ref());
+                    if self.height == block.header().number() {
+                        cdebug!(
+                            ENGINE,
+                            "Empty proposal timer is finished, go to the prevote step and broadcast the block"
+                        );
+                        self.submit_proposal_block(block.as_ref());
+                    } else {
+                        cwarn!(ENGINE, "Empty proposal timer was for previous height.");
+                    }
                 }
                 _ => {
                     cwarn!(ENGINE, "Empty proposal timer was not cleared.");