diff --git a/types/vote_set.go b/types/vote_set.go
index fe6c0fd51..dba5a5cf0 100644
--- a/types/vote_set.go
+++ b/types/vote_set.go
@@ -385,7 +385,9 @@ func (voteSet *VoteSet) List() []Vote {
 	}
 	votes := make([]Vote, len(voteSet.votes))
 	for i := range voteSet.votes {
-		votes[i] = *voteSet.votes[i]
+		if voteSet.votes[i] != nil {
+			votes[i] = *voteSet.votes[i]
+		}
 	}
 	return votes
 }