diff --git a/internal/state/execution.go b/internal/state/execution.go
index 2dfb7e214..3a1427e18 100644
--- a/internal/state/execution.go
+++ b/internal/state/execution.go
@@ -438,12 +438,11 @@ func buildLastCommitInfo(block *types.Block, store Store, initialHeight int64) a
 
 func extendedCommitInfo(c abci.CommitInfo, votes []*types.Vote) abci.ExtendedCommitInfo {
 	vs := make([]abci.ExtendedVoteInfo, len(c.Votes))
-	var ext []byte
 	for i := range vs {
+		var ext []byte
+		// votes[i] will be nil if c.Votes[i].SignedLastBlock is false
 		if c.Votes[i].SignedLastBlock {
 			ext = votes[i].Extension
-		} else {
-			ext = nil
 		}
 		vs[i] = abci.ExtendedVoteInfo{
 			Validator:       c.Votes[i].Validator,