diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php
index 1adc6f8cbbb1864fe245c5d1e9b52c88afa8c87d..165a9242fc83e0519e4f52efc0341117724dcf69 100644
--- a/app/classes/Framadate/Services/PollService.php
+++ b/app/classes/Framadate/Services/PollService.php
@@ -296,7 +296,7 @@ class PollService {
         $best_choices = $this->computeBestChoices($votes);
         foreach ($best_choices['y'] as $i => $nb_choice) {
             // if for this option we have reached maximum value and user wants to add itself too
-            if ($nb_choice >= $poll->ValueMax && $user_choice[$i] === "2") {
+	     if ($poll->ValueMax != null && $nb_choice >= $poll->ValueMax && $user_choice[$i] === "2") {
                 throw new ConcurrentVoteException();
             }
         }