diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php
index 88c9de017de407bf839ea91e59c7156d0991ed5f..7604082fb86941f32e05aa398c47c486d6ae58b0 100644
--- a/app/classes/Framadate/Services/AdminPollService.php
+++ b/app/classes/Framadate/Services/AdminPollService.php
@@ -37,13 +37,9 @@ class AdminPollService {
         $end_date = strtotime($poll->end_date);
 
         if ($end_date < strtotime($poll->creation_date)) {
-            
             $poll->end_date = $poll->creation_date;
-            
         } elseif ($end_date > $this->pollService->maxExpiryDate()) {
-            
-            $poll->end_date = $this->pollService->maxExpiryDate();
-            
+            $poll->end_date = utf8_encode(strftime('%Y-%m-%d', $this->pollService->maxExpiryDate()));
         }
 
         return $this->pollRepository->update($poll);