diff --git a/internal/consensus/peer_state.go b/internal/consensus/peer_state.go
index 73e61f21c..6a64e8e10 100644
--- a/internal/consensus/peer_state.go
+++ b/internal/consensus/peer_state.go
@@ -193,7 +193,10 @@ func (ps *PeerState) PickVoteToSend(votes types.VoteSetReader) (*types.Vote, boo
 	}
 
 	if index, ok := votes.BitArray().Sub(psVotes).PickRandom(); ok {
-		return votes.GetByIndex(int32(index)), true
+		vote := votes.GetByIndex(int32(index))
+		if vote != nil {
+			return vote, true
+		}
 	}
 
 	return nil, false
@@ -358,6 +361,9 @@ func (ps *PeerState) BlockPartsSent() int {
 
 // SetHasVote sets the given vote as known by the peer
 func (ps *PeerState) SetHasVote(vote *types.Vote) {
+	if vote == nil {
+		return
+	}
 	ps.mtx.Lock()
 	defer ps.mtx.Unlock()
 
diff --git a/types/vote_set.go b/types/vote_set.go
index b064f2c07..e014ae7bb 100644
--- a/types/vote_set.go
+++ b/types/vote_set.go
@@ -372,6 +372,9 @@ func (voteSet *VoteSet) GetByIndex(valIndex int32) *Vote {
 	}
 	voteSet.mtx.Lock()
 	defer voteSet.mtx.Unlock()
+	if int(valIndex) >= len(voteSet.votes) {
+		return nil
+	}
 	return voteSet.votes[valIndex]
 }