diff --git a/src/main/java/com/faforever/api/data/domain/VotingChoice.java b/src/main/java/com/faforever/api/data/domain/VotingChoice.java
index aa96a8a96..2c60ddf1c 100644
--- a/src/main/java/com/faforever/api/data/domain/VotingChoice.java
+++ b/src/main/java/com/faforever/api/data/domain/VotingChoice.java
@@ -82,7 +82,7 @@ public Integer getOrdinal() {
 
   @Transient
   @ComputedAttribute
-  public int getNumberOfAnswers() {
+  public Integer getNumberOfAnswers() {
     return numberOfAnswers;
   }
 
diff --git a/src/main/java/com/faforever/api/data/validation/VotingSubjectRevealWinnerValidator.java b/src/main/java/com/faforever/api/data/validation/VotingSubjectRevealWinnerValidator.java
index 3a07a2e23..66324f574 100644
--- a/src/main/java/com/faforever/api/data/validation/VotingSubjectRevealWinnerValidator.java
+++ b/src/main/java/com/faforever/api/data/validation/VotingSubjectRevealWinnerValidator.java
@@ -15,6 +15,6 @@ public void initialize(VotingSubjectRevealWinnerCheck constraintAnnotation) {
 
   @Override
   public boolean isValid(VotingSubject votingSubject, ConstraintValidatorContext context) {
-    return votingSubject.getRevealWinner() && votingSubject.getEndOfVoteTime().isBefore(OffsetDateTime.now());
+    return votingSubject.getRevealWinner() != Boolean.TRUE || votingSubject.getEndOfVoteTime().isBefore(OffsetDateTime.now());
   }
 }