diff --git a/consensus/state.go b/consensus/state.go
index c8c2f96b..c26f96af 100644
--- a/consensus/state.go
+++ b/consensus/state.go
@@ -757,7 +757,7 @@ func (cs *ConsensusState) handleTxsAvailable() {
 	cs.mtx.Lock()
 	defer cs.mtx.Unlock()
 
-	if cs.config.SkipTimeoutCommit && cs.LastCommit.HasAll() {
+	if cs.config.SkipTimeoutCommit && cs.LastCommit != nil && cs.LastCommit.HasAll() {
 		// we only need to do this for round 0
 		cs.enterNewRound(cs.Height, 0)
 		cs.enterPropose(cs.Height, 0)